diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..d05d003
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+# Contributing to Eclipse openK User Modules
+
+Thanks for your interest in this project.
+
+## Project description
+
+The project starts with the module Feed-In Management ("Last- und
+Einspeisemanagement") based on the German Electricity Feed-In Act. The future
+demand for electric energy is to be adapted to the supply and availability of
+renewable energy. Based on specific rules and parameters the Feed-In Management
+calculates a blueprint for electric switching stations and power plants based on
+renewable energy. Implementing the calculation input data is needed from
+electric networks, switching stations, power plants, electric demands and
+feed-in capabilities.
+
+* https://projects.eclipse.org/projects/technology.openk-usermodules
+
+## Developer resources
+
+Information regarding source code management, builds, coding standards, and
+more.
+
+* https://projects.eclipse.org/projects/technology.openk-usermodules/developer
+
+The project maintains the following source code repositories
+
+* http://git.eclipse.org/c/openk-usermodules/openk-usermodules.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.mics.centralService.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.mics.homeService.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.plannedGridMeasures.backend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.plannedGridMeasures.frontend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.backend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.docu.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.frontend.git
+
+This project uses Bugzilla to track ongoing development and issues.
+
+* Search for issues: https://eclipse.org/bugs/buglist.cgi?product=openK User
+   Modules
+* Create a new report: https://eclipse.org/bugs/enter_bug.cgi?product=openK
+   User Modules
+
+Be sure to search for existing bugs before you create another one. Remember that
+contributions are always welcome!
+
+## Eclipse Contributor Agreement
+
+Before your contribution can be accepted by the project team contributors must
+electronically sign the Eclipse Contributor Agreement (ECA).
+
+* http://www.eclipse.org/legal/ECA.php
+
+Commits that are provided by non-committers must have a Signed-off-by field in
+the footer indicating that the author is aware of the terms by which the
+contribution has been provided to the project. The non-committer must
+additionally have an Eclipse Foundation account and must have a signed Eclipse
+Contributor Agreement (ECA) on file.
+
+For more information, please see the Eclipse Committer Handbook:
+https://www.eclipse.org/projects/handbook/#resources-commit
+
+## Contact
+
+Contact the project developers via the project's "dev" list.
+
+* https://accounts.eclipse.org/mailing-list/openk-usermodules-dev
\ No newline at end of file
diff --git a/LICENSE.md b/LICENSE.md
index 11ecb79..55979aa 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,198 +1,260 @@
-Eclipse Public License - v 1.0
+Eclipse Public License - v 2.0
 
-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.
+    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.
 
 1. DEFINITIONS
 
 "Contribution" means:
 
-a) in the case of the initial Contributor, the initial code and documentation
-   distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-    i) changes to the Program, and
-   ii) additions to the Program;
+  a) in the case of the initial Contributor, the initial content
+     Distributed under this Agreement, and
 
-   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.
+  b) in the case of each subsequent Contributor:
+     i) changes to the Program, and
+     ii) additions to the Program;
+  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 changes or additions to the Program that
+  are not Modified Works.
 
-"Contributor" means any person or entity that distributes the Program.
+"Contributor" means any person or entity that Distributes the Program.
 
-"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.
+"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.
 
-"Program" means the Contributions distributed in accordance with this Agreement.
+"Program" means the Contributions Distributed in accordance with this
+Agreement.
 
-"Recipient" means anyone who receives the Program under this Agreement,
-including all Contributors.
+"Recipient" means anyone who receives the Program under this Agreement
+or any Secondary License (as applicable), including Contributors.
+
+"Derivative Works" 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.
+
+"Modified Works" 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.
+
+"Distribute" means the acts of a) distributing or b) making available
+in any manner that enables the transfer of a copy.
+
+"Source Code" means the form of a Program preferred for making
+modifications, including but not limited to software source code,
+documentation source, and configuration files.
+
+"Secondary License" 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.
 
 2. GRANT OF RIGHTS
-  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.
-  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.
-  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.
-  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.
+
+  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.
+
+  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.
+
+  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.
+
+  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.
+
+  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's
+  receipt of the Program under the terms of a Secondary License
+  (if permitted under the terms of Section 3).
 
 3. REQUIREMENTS
 
-A Contributor may choose to distribute the Program in object code form under its
-own license agreement, provided that:
+3.1 If a Contributor Distributes the Program in any form, then:
 
-  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.
+  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
 
-When the Program is made available in source code form:
+  b) the Contributor may Distribute the Program under a license
+  different than this Agreement, provided that such license:
+     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;
 
-  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.
+     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;
 
-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.
+     iii) does not attempt to limit or alter the recipients' rights
+     in the Source Code under section 3.2; and
+
+     iv) requires any subsequent distribution of the Program by any
+     party to be under a license that satisfies the requirements
+     of this section 3.
+
+3.2 When the Program is Distributed as Source Code:
+
+  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
+
+  b) a copy of this Agreement must be included with each copy of
+  the Program.
+
+3.3 Contributors may not remove or alter any copyright, patent,
+trademark, attribution notices, disclaimers of warranty, or limitations
+of liability ("notices") contained within the Program from any copy of
+the Program which they Distribute, provided that Contributors may add
+their own appropriate notices.
 
 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.
+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.
+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.
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT
+PERMITTED BY APPLICABLE LAW, 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.
+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.
 
 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 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.
+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.
+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
+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.
+Contributor may elect to Distribute the Program (including its
+Contributions) under the new version.
 
-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.
+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.
\ No newline at end of file
diff --git a/NOTICE.md b/NOTICE.md
new file mode 100644
index 0000000..f249680
--- /dev/null
+++ b/NOTICE.md
@@ -0,0 +1,545 @@
+# Notices for Eclipse openK User Modules
+
+This content is produced and maintained by the Eclipse openK User Modules
+project.
+
+* Project home:
+   https://projects.eclipse.org/projects/technology.openk-usermodules
+
+## Trademarks
+
+Eclipse openK User Modules is a trademark of the Eclipse Foundation.
+
+## Copyright
+
+All content is the property of the respective authors or their employers. For
+more information regarding authorship of content, please consult the listed
+source code repository logs.
+
+## Declared Project Licenses
+
+This program and the accompanying materials are made available under the terms
+of the Eclipse Public License v. 2.0 which is available at
+http://www.eclipse.org/legal/epl-2.0.
+
+SPDX-License-Identifier: EPL-2.0
+
+## Source Code
+
+The project maintains the following source code repositories:
+
+* http://git.eclipse.org/c/openk-usermodules/openk-usermodules.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.mics.centralService.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.mics.homeService.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.plannedGridMeasures.backend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.plannedGridMeasures.frontend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.backend.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.docu.git
+* http://git.eclipse.org/c/openk-usermodules/org.eclipse.openk-usermodules.standbyPlanning.frontend.git
+
+## Third-party Content
+
+This project leverages the following third party content.
+
+ag-grid (18.0.1)
+
+* License: MIT
+* Project: https://www.ag-grid.com/
+* Source: https://github.com/ag-grid/ag-grid
+
+ag-grid-angular (n/a)
+
+* License: MIT
+* Project: https://www.ag-grid.com/
+* Source: https://github.com/ag-grid/ag-grid-angular
+
+ajv (6.5.2)
+
+* License: MIT AND (BSD-3-Clause OR AFL-2.1)
+* Source: https://github.com/epoberezkin/ajv/releases/tag/v6.5.2
+
+angular animations (5.2.11)
+
+* License: MIT
+* Project: https://angular.io/guide/animations
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular animations (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/guide/animations
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular calendar (0.23.7)
+
+* License: MIT
+* Source: https://github.com/mattlewis92/angular-calendar/releases/tag/v0.23.7
+
+angular common (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular common (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/api/common
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular compiler (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular compiler (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular core (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular core (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular forms (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular forms (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular http (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular http (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular jwt (1.0)
+
+* License: MIT
+* Source: https://github.com/auth0/angular2-jwt
+
+angular material2 (5.2.5)
+
+* License: MIT
+* Source: https://github.com/angular/material2/tree/5.2.5
+
+angular platform-browser (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular platform-browser (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular platform-browser-dynamic (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular platform-browser-dynamic (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular router (5.2.11)
+
+* License: MIT
+* Source: https://github.com/angular/angular/releases/tag/5.2.11
+
+angular router (6.1.0)
+
+* License: Apache-2.0 AND MIT
+* Project: https://angular.io/
+* Source: https://github.com/angular/angular/releases/tag/6.1.0
+
+angular2-uuid (1.1.1)
+
+* License: MIT
+
+Apache Commons Lang (2.6)
+
+* License: Apache License, 2.0
+
+Apache HttpClient (4.5.3)
+
+* License: Apache-2.0
+
+Apache HttpClient (4.5.3)
+
+* License: Apache-2.0
+
+Apache Log4j (1.2.17)
+
+* License: Apache License 2.0
+
+arc42 template (n/a)
+
+* License: MIT
+* Project: https://arc42.org/overview/
+* Source:
+   https://github.com/arc42/arc42-template/raw/master/dist/arc42-template-EN-plain-docx.zip
+
+auth0/angular-jwt (2.0.0)
+
+* License: MIT
+* Project: https://github.com/auth0/angular2-jwt
+* Source: https://github.com/auth0/angular2-jwt/releases/tag/2.0.0
+
+Bootstrap (3.3.7)
+
+* License: MIT
+
+bootstrap (4.1.1)
+
+* License: MIT
+* Project: https://getbootstrap.com/
+* Source: https://github.com/twbs/bootstrap
+
+bootstrap toggle (2.2.2)
+
+* License: MIT
+* Source: https://github.com/minhur/bootstrap-toggle/releases/tag/2.2.2
+
+camunda-engine-spring (7.9.0)
+
+* License: Apache-2.0
+* Project: https://github.com/camunda/camunda-bpm-platform
+* Source: https://github.com/camunda/
+
+cglib (3.1)
+
+* License: Apache License, 2.0, New BSD license
+
+classlist.js (1.1.20150312)
+
+* License: Unlicense
+
+classlist.js (1.1.20150312)
+
+* License: Unlicense
+
+com.google.code.gson : gson : (2.8.5)
+
+* License: Apache-2.0
+* Project: https://github.com/google/gson
+* Source: https://github.com/google/gson
+
+commons-codec (1.11)
+
+* License: Apache-2.0 AND BSD-3-Clause
+
+commons-codec:commons-codec (1.10)
+
+* License: Apache License, 2.0
+
+commons-io (2.5)
+
+* License: Apache License, 2.0
+
+commons-io:commons-io (2.6)
+
+* License: Apache-2.0
+
+core js (2.5.7)
+
+* License: BSD 3-Clause AND MIT
+* Source: https://github.com/zloirock/core-js/releases/tag/v2.5.7
+
+core-js (2.5.4)
+
+* License: MIT
+* Project: https://github.com/zloirock/core-js
+* Source: https://github.com/zloirock/core-js/releases/tag/v2.5.4
+
+core-js, (2.4.1)
+
+* License: MIT
+
+dozer V.5.5.1 (5.5.1)
+
+* License: Apache License, 2.0
+
+dropwizard (1.3.1)
+
+* License: Apache-2.0 AND MIT AND BSD-3-Clause
+* Source: https://github.com/dropwizard/dropwizard/tree/v1.3.1
+
+dropwizard.dropwizard-core (9.0.2)
+
+* License: Apache-2.0
+
+easymock (3.3.1)
+
+* License: Apache License, 2.0
+
+file-saver (1.3.8)
+
+* License: MIT
+* Source: https://github.com/eligrey/FileSaver.js/releases/tag/1.3.8
+
+font-awesome (4.7.0)
+
+* License: OFL-1.1 AND MIT
+
+font-awesome (4.7.0)
+
+* License: OFL-1.1 AND MIT
+
+gson (2.8.0)
+
+* License: Apache-2.0
+
+h2 Database (1.3.168)
+
+* License: Eclipse Public License
+
+HikariCP-java7 (2.4.13)
+
+* License: Apache-2.0
+* Project: http://brettwooldridge.github.io/HikariCP/
+* Source: https://github.com/brettwooldridge/HikariCP
+
+jackson-annotations (2.5.4)
+
+* License: Apache-2.0
+
+jackson-core (2.8.6)
+
+* License: Apache-2.0
+
+jackson-databind (2.8.6)
+
+
+jackson-dataformat-yaml (2.8.6)
+
+* License: Apache-2.0
+
+javax.mail (1.4.3)
+
+* License: (CDDL-1.0 OR GPL-2.0+ WITH Classpath-exception-2.0)
+
+javax.servlet-api (3.1.0)
+
+* License: Apache-2.0 AND (CDDL-1.1 or GPL-2.0)
+
+javax.servlet-api (3.1.0)
+
+* License: Apache-2.0 AND (CDDL-1.1 or GPL-2.0)
+
+jawa-jwt (3.2.0)
+
+* License: MIT
+
+jersey-bundles-jaxrs-ri (jaxrs-ri-2.22.1.jar) (2.22.1)
+
+* License: Common Development and Distribution License, Apache 2.0
+
+jersey-container-servlet-core (2.23.2)
+
+* License: Common Development and Distribution License 1.1
+
+jersey-media-json-jackson (2.23.2)
+
+* License: CDDL-1.1 OR GPL-2.0 With Classpath-exception-2.0
+
+jersey-spring3 (2.23.2)
+
+* License: CDDL-1.1 OR GPL-2.0 With Classpath-exception-2.0
+* Project:
+   https://mvnrepository.com/artifact/org.glassfish.jersey.ext/jersey-spring3
+* Source:
+   https://repo1.maven.org/maven2/org/glassfish/jersey/ext/jersey-spring3/2.23.2/
+
+jjwt (0.6.0)
+
+* License: Apache License, 2.0
+
+jQuery (3.3.1)
+
+* License: MIT
+
+JUnit (4.12)
+
+* License: Eclipse Public License
+
+mockito (1.9.5)
+
+* License: Apache License, 2.0, New BSD license, MIT license
+
+ng-bootstrap (2.2.0)
+
+* License: MIT
+* Project: https://ng-bootstrap.github.io/#/home
+* Source: https://github.com/ng-bootstrap/ng-bootstrap
+
+ng2 daterangepicker (2.0.12)
+
+* License: MIT
+* Project: https://www.npmjs.com/package/ng2-daterangepicker
+* Source:
+   https://github.com/evansmwendwa/ng2-daterangepicker/releases/tag/2.0.12
+
+ng2-tree-2.0.0-rc.11 (2.0.0)
+
+* License: MIT
+* Source: https://github.com/valor-software/ng2-tree/tree/v2.0.0-rc.11
+
+Popper (1.14.3)
+
+* License: MIT AND CC-BY-3.0 AND (MIT OR GPL-2.0) AND LicenseRef-Public-Domain
+* Project: https://popper.js.org/
+* Source: https://github.com/FezVrasta/popper.js/releases/tag/v1.14.3
+
+postgres.postgresql (9.1)
+
+* License: BSD-3-Clause AND License-Ref-Public-Domain
+
+powermock (1.7.3)
+
+* License: Apache-2.0 AND BSD-3-Clause AND MIT AND (GPL-2.0 OR GPL-2.0 With
+   Classpath-exception) AND LicenseRef-Public-Domain
+* Source: https://github.com/powermock/powermock/tree/powermock-1.7.3
+
+powermock-module-junit4-common (1.6.6)
+
+* License: Apache-2.0
+
+primeicons (1.0.0)
+
+* License: MIT
+* Project: https://www.primefaces.org/primeng/#/
+* Source: https://github.com/primefaces/primeicons
+
+primeng (6.0.0)
+
+* License: MIT
+* Project: https://www.primefaces.org/primeng/#/
+* Source: https://github.com/primefaces/primeng
+
+primeng (6.1.3)
+
+* License: MIT
+* Project: https://www.primefaces.org/primeng/#/
+* Source: https://github.com/primefaces/primeng
+
+RabbitMQ AMQP client (5.2.0)
+
+* License: MPL-2.0 OR GPL-2.0 OR Apache-2.0
+
+rxjs (5.5.11)
+
+* License: Apache-2.0
+* Source: https://github.com/ReactiveX/rxjs/releases/tag/5.5.11
+
+rxjs (6.2.2)
+
+* License: Apache-2.0
+* Project: https://github.com/Reactive-Extensions/RxJS
+* Source: https://github.com/Reactive-Extensions/RxJS
+
+slf4j-api (1.7.5)
+
+* License: MIT License + MIT License with no endorsement clause
+
+slf4j-log4j12 (1.7.25)
+
+* License: MIT
+
+Source Sans Pro (n/a)
+
+* License: OFL-1.1
+* Project:
+   http://www.adobe.com/products/type/font-information/source-sans-pro-readme.html
+
+spinKit (1.2.5)
+
+* License: MIT
+
+spring-data-jpa (1.9.1)
+
+* License: Apache License, 2.0
+
+spring-jdbc (4.3.17)
+
+* License: Apache-2.0
+* Project: https://spring.io/
+* Source:
+   http://central.maven.org/maven2/org/springframework/spring-jdbc/4.3.17.RELEASE/
+
+spring-test (4.3.17)
+
+* License: Apache-2.0 AND LicenseRef-Public-Domain
+* Project: https://spring.io/
+* Source:
+   http://central.maven.org/maven2/org/springframework/spring-test/3.2.17.RELEASE/
+
+spring-web (4.3.17)
+
+* License: Apache-2.0
+* Project: https://spring.io/
+* Source: https://github.com/spring-projects/spring-framework
+
+swagger-core (1.5.12)
+
+* License: Apache-2.0
+
+swagger-jersey2-jaxrs (1.5.12)
+
+* License: Apache-2.0
+
+urlrewritefilter (4.0.4)
+
+* License: BSD-3-Clause AND (Apache-2.0 OR LGPL-2.0 OR GPL-2.0)
+* Project: https://github.com/paultuckey/urlrewritefilter
+* Source: https://github.com/paultuckey/urlrewritefilter
+
+web-animations (2.3.1)
+
+* License: Apache-2.0 AND BSD-3-Clause AND MIT
+* Source: https://github.com/web-animations/web-animations-js
+
+web-animations-js (2.3.1)
+
+* License: Apache-2.0
+* Project: https://github.com/web-animations/web-animations-js
+* Source:
+   https://github.com/web-animations/web-animations-js/releases/tag/2.3.1
+
+zone.js (0.8.26)
+
+* License: MIT
+
+zone.js (0.8.26)
+
+* License: MIT
+* Source: https://github.com/angular/zone.js/releases/tag/v0.8.26
+
+## Cryptography
+
+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.
\ No newline at end of file
diff --git a/db/migrations/V0_10__CREATE_PLGM_DB.sql b/db/migrations/V0_10__CREATE_PLGM_DB.sql
index a1ac460..d512007 100644
--- a/db/migrations/V0_10__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_10__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --INSERT new Field color_code into TABLE REF_BRANCH
 --UPDATE HREF_BRANCH,
 --UPDATE REF_BRANCH INSERT TRIGGER, REF_BRANCH DELETE TRIGGER, REF_BRANCH UPDATE TRIGGER
diff --git a/db/migrations/V0_11__CREATE_PLGM_DB.sql b/db/migrations/V0_11__CREATE_PLGM_DB.sql
index d03efc6..ebf82e2 100644
--- a/db/migrations/V0_11__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_11__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --INSERT new TABLE REF_USER_SETTINGS inkl. INSERT-, UPDATE-, DELETE-TRIGGER
 --INSERT new TABLE HREF_USER_SETTINGS
 
diff --git a/db/migrations/V0_12__CREATE_PLGM_DB.sql b/db/migrations/V0_12__CREATE_PLGM_DB.sql
index c3973ac..8809b45 100644
--- a/db/migrations/V0_12__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_12__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --INSERT new Foreign-key Constraints into Table TBL_GRIDMEASURES
 --(ref_cost_center, ref_branch, ref_branch_level)
 
diff --git a/db/migrations/V0_13__CREATE_PLGM_DB.sql b/db/migrations/V0_13__CREATE_PLGM_DB.sql
index 6e7a3d8..5544bfd 100644
--- a/db/migrations/V0_13__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_13__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Change field value in REF_USER_SETTINGS to a maximum size of 4096 characters
 --Change field value in HREF_USER_SETTINGS to a maximum size of 4096 characters
 
diff --git a/db/migrations/V0_14__CREATE_PLGM_DB.sql b/db/migrations/V0_14__CREATE_PLGM_DB.sql
index 547ffe9..747f9dd 100644
--- a/db/migrations/V0_14__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_14__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Change field value in REF_USER_SETTINGS to a maximum size of 4096 characters
 --Change field value in HREF_USER_SETTINGS to a maximum size of 4096 characters
 
diff --git a/db/migrations/V0_15__CREATE_PLGM_DB.sql b/db/migrations/V0_15__CREATE_PLGM_DB.sql
index 8da55ef..a00eb8c 100644
--- a/db/migrations/V0_15__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_15__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Change field value in REF_USER_SETTINGS to a maximum size of 4096 characters
 --Change field value in HREF_USER_SETTINGS to a maximum size of 4096 characters
 
diff --git a/db/migrations/V0_16__CREATE_PLGM_DB.sql b/db/migrations/V0_16__CREATE_PLGM_DB.sql
index 88105cb..d99b3c3 100644
--- a/db/migrations/V0_16__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_16__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table REF_USER_SETTINGS and all dependent items renamed to TBL_USER_SETTINGS
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_17__CREATE_PLGM_DB.sql b/db/migrations/V0_17__CREATE_PLGM_DB.sql
index ff8e61b..0116d7d 100644
--- a/db/migrations/V0_17__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_17__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Foreign Key Field FK_REF_COST_CENTER in table TBL_GRIDMEASURES, HTBL_GRIDMEASURES set to String.
 --Delete Foreign Key Constraint fk_gridmeasure__cost_center
 
diff --git a/db/migrations/V0_18__CREATE_PLGM_DB.sql b/db/migrations/V0_18__CREATE_PLGM_DB.sql
index 25af019..bd007bd 100644
--- a/db/migrations/V0_18__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_18__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --DROP TABLE for REF_USER_SETTINGS added
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_19__CREATE_PLGM_DB.sql b/db/migrations/V0_19__CREATE_PLGM_DB.sql
index 3a94fd7..3de9eac 100644
--- a/db/migrations/V0_19__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_19__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --DROP TABLE for TBL_USER_SETTINGS added
 --DROP SEQUENCE for TTBL_USER_SETTINGS_ID_SEQ added
 
diff --git a/db/migrations/V0_20__CREATE_PLGM_DB.sql b/db/migrations/V0_20__CREATE_PLGM_DB.sql
index 8352b84..5d5a38a 100644
--- a/db/migrations/V0_20__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_20__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Data added to TBL_GRIDMEASURE
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_21__CREATE_PLGM_DB.sql b/db/migrations/V0_21__CREATE_PLGM_DB.sql
index ff39751..b1c5924 100644
--- a/db/migrations/V0_21__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_21__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_22__CREATE_PLGM_DB.sql b/db/migrations/V0_22__CREATE_PLGM_DB.sql
index 8458e7e..3029d99 100644
--- a/db/migrations/V0_22__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_22__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_23__CREATE_PLGM_DB.sql b/db/migrations/V0_23__CREATE_PLGM_DB.sql
index 6fa5538..edb8ccb 100644
--- a/db/migrations/V0_23__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_23__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_24__CREATE_PLGM_DB.sql b/db/migrations/V0_24__CREATE_PLGM_DB.sql
index 5a09d6a..a00461d 100644
--- a/db/migrations/V0_24__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_24__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_25__CREATE_PLGM_DB.sql b/db/migrations/V0_25__CREATE_PLGM_DB.sql
index ec7df19..67e3a14 100644
--- a/db/migrations/V0_25__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_25__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_26__CREATE_PLGM_DB.sql b/db/migrations/V0_26__CREATE_PLGM_DB.sql
index 3f3408f..3b1c0d2 100644
--- a/db/migrations/V0_26__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_26__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_27__CREATE_PLGM_DB.sql b/db/migrations/V0_27__CREATE_PLGM_DB.sql
index 2f940f0..c9cfb39 100644
--- a/db/migrations/V0_27__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_27__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_28__CREATE_PLGM_DB.sql b/db/migrations/V0_28__CREATE_PLGM_DB.sql
index 27ed3af..5f0e39e 100644
--- a/db/migrations/V0_28__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_28__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_29__CREATE_PLGM_DB.sql b/db/migrations/V0_29__CREATE_PLGM_DB.sql
index dec77e3..9c71f39 100644
--- a/db/migrations/V0_29__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_29__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_30__CREATE_PLGM_DB.sql b/db/migrations/V0_30__CREATE_PLGM_DB.sql
index f65806b..6a66046 100644
--- a/db/migrations/V0_30__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_30__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_31__CREATE_PLGM_DB.sql b/db/migrations/V0_31__CREATE_PLGM_DB.sql
index a6baf40..ad80d99 100644
--- a/db/migrations/V0_31__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_31__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_32__CREATE_PLGM_DB.sql b/db/migrations/V0_32__CREATE_PLGM_DB.sql
index 0497d72..7ff1c1e 100644
--- a/db/migrations/V0_32__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_32__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_33__CREATE_PLGM_DB.sql b/db/migrations/V0_33__CREATE_PLGM_DB.sql
index ac99837..6e0c734 100644
--- a/db/migrations/V0_33__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_33__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_34__CREATE_PLGM_DB.sql b/db/migrations/V0_34__CREATE_PLGM_DB.sql
index cf4902b..0ef6d73 100644
--- a/db/migrations/V0_34__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_34__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_35__CREATE_PLGM_DB.sql b/db/migrations/V0_35__CREATE_PLGM_DB.sql
index 136f71b..6f5671f 100644
--- a/db/migrations/V0_35__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_35__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_36__CREATE_PLGM_DB.sql b/db/migrations/V0_36__CREATE_PLGM_DB.sql
index f6e33f0..f560f3a 100644
--- a/db/migrations/V0_36__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_36__CREATE_PLGM_DB.sql
@@ -1,16 +1,18 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
---Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
+
+--Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 
 -- ---------------------------------------------
 -- DROPS
diff --git a/db/migrations/V0_37__CREATE_PLGM_DB.sql b/db/migrations/V0_37__CREATE_PLGM_DB.sql
index 6ca69e1..048a253 100644
--- a/db/migrations/V0_37__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_37__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Table TBL_LOCK added, table HTBL_LOCK added incl. Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_38__CREATE_PLGM_DB.sql b/db/migrations/V0_38__CREATE_PLGM_DB.sql
index cde134c..48449c5 100644
--- a/db/migrations/V0_38__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_38__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Index HUSER_INDEX added
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_39__CREATE_PLGM_DB.sql b/db/migrations/V0_39__CREATE_PLGM_DB.sql
index b26ffcf..c7ac9fd 100644
--- a/db/migrations/V0_39__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_39__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Index HUSER_INDEX added
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_3__CREATE_PLGM_DB.sql b/db/migrations/V0_3__CREATE_PLGM_DB.sql
index 8c3c5c4..d45f183 100644
--- a/db/migrations/V0_3__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_3__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-﻿/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+﻿-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --CREATE ROLE PLGM_SERVICE LOGIN
 --NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION;
 --ALTER ROLE PLGM_SERVICE with password 'plgm_service';
diff --git a/db/migrations/V0_40__CREATE_PLGM_DB.sql b/db/migrations/V0_40__CREATE_PLGM_DB.sql
index 8024d50..370cf74 100644
--- a/db/migrations/V0_40__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_40__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Index HUSER_INDEX added
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_41__CREATE_PLGM_DB.sql b/db/migrations/V0_41__CREATE_PLGM_DB.sql
index bbe4c5e..0b84eb9 100644
--- a/db/migrations/V0_41__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_41__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Index HUSER_INDEX added
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_42__CREATE_PLGM_DB.sql b/db/migrations/V0_42__CREATE_PLGM_DB.sql
index 495876f..9717758 100644
--- a/db/migrations/V0_42__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_42__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Field COLOR_CODE added in Table REF_GM_STATUS, HREF_GM_STATUS, Insert-, Delete-, and Update-Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_43__CREATE_PLGM_DB.sql b/db/migrations/V0_43__CREATE_PLGM_DB.sql
index a908476..1a5ffa7 100644
--- a/db/migrations/V0_43__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_43__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Field COLOR_CODE added in Table REF_GM_STATUS, HREF_GM_STATUS, Insert-, Delete-, and Update-Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_44__CREATE_PLGM_DB.sql b/db/migrations/V0_44__CREATE_PLGM_DB.sql
index f8edb14..7709872 100644
--- a/db/migrations/V0_44__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_44__CREATE_PLGM_DB.sql
@@ -1,15 +1,17 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Field COLOR_CODE added in Table REF_GM_STATUS, HREF_GM_STATUS, Insert-, Delete-, and Update-Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_45__CREATE_PLGM_DB.sql b/db/migrations/V0_45__CREATE_PLGM_DB.sql
index 8be300c..793fde4 100644
--- a/db/migrations/V0_45__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_45__CREATE_PLGM_DB.sql
@@ -1,15 +1,4 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+
 --Field COLOR_CODE added in Table REF_GM_STATUS, HREF_GM_STATUS, Insert-, Delete-, and Update-Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_46__CREATE_PLGM_DB.sql b/db/migrations/V0_46__CREATE_PLGM_DB.sql
index 5e884db..d70dfec 100644
--- a/db/migrations/V0_46__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_46__CREATE_PLGM_DB.sql
@@ -1,15 +1,4 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+
 --Field COLOR_CODE added in Table REF_GM_STATUS, HREF_GM_STATUS, Insert-, Delete-, and Update-Triggers
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_47__CREATE_PLGM_DB.sql b/db/migrations/V0_47__CREATE_PLGM_DB.sql
index 25d1395..c044460 100644
--- a/db/migrations/V0_47__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_47__CREATE_PLGM_DB.sql
@@ -1,15 +1,18 @@
-/*
-**********
-********************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
+--
 --Field Inserts of Gridmeasuredata (into tables TBL_GRIDMEASURE, HTBL_GRIDMEASURE, TBL_SINGLE_GRIDMEASURE, HTBL_SINGLE_GRIDMEASURE) deleted
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_4__CREATE_PLGM_DB.sql b/db/migrations/V0_4__CREATE_PLGM_DB.sql
index 9e0e6ce..abf1478 100644
--- a/db/migrations/V0_4__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_4__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-﻿/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+﻿-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --CREATE ROLE PLGM_SERVICE LOGIN
 --NOSUPERUSER INHERIT NOCREATEDB NOCREATEROLE NOREPLICATION;
 --ALTER ROLE PLGM_SERVICE with password 'plgm_service';
diff --git a/db/migrations/V0_5__CREATE_PLGM_DB.sql b/db/migrations/V0_5__CREATE_PLGM_DB.sql
index 3a828f7..9cdf064 100644
--- a/db/migrations/V0_5__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_5__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --ADD DATA TO TABLE TBL_GRIDMEASURE;
 --ADD DATA TO TABLE REF_GM_STATUS;
 
diff --git a/db/migrations/V0_6__CREATE_PLGM_DB.sql b/db/migrations/V0_6__CREATE_PLGM_DB.sql
index 96bb8c0..729e485 100644
--- a/db/migrations/V0_6__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_6__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --ADD DATA TO TABLE TBL_GRIDMEASURE;
 --ADD DATA TO TABLE REF_GM_STATUS;
 
diff --git a/db/migrations/V0_7__CREATE_PLGM_DB.sql b/db/migrations/V0_7__CREATE_PLGM_DB.sql
index f30d01a..b1059af 100644
--- a/db/migrations/V0_7__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_7__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --ADD DATA TO TABLE TBL_GRIDMEASURE;
 --ADD DATA TO TABLE REF_GM_STATUS;
 
diff --git a/db/migrations/V0_8__CREATE_PLGM_DB.sql b/db/migrations/V0_8__CREATE_PLGM_DB.sql
index db4dd0a..ec7e407 100644
--- a/db/migrations/V0_8__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_8__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Update Data Inserts into Table REF_GM_STATUS;
 
 -- ---------------------------------------------
diff --git a/db/migrations/V0_9__CREATE_PLGM_DB.sql b/db/migrations/V0_9__CREATE_PLGM_DB.sql
index b9da2c1..c6fae59 100644
--- a/db/migrations/V0_9__CREATE_PLGM_DB.sql
+++ b/db/migrations/V0_9__CREATE_PLGM_DB.sql
@@ -1,14 +1,17 @@
-/*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
-*/
+-----------------------------------------------------------------------------------
+-- *******************************************************************************
+-- * Copyright (c) 2018 Contributors to the Eclipse Foundation
+-- *
+-- * See the NOTICE file(s) distributed with this work for additional
+-- * information regarding copyright ownership.
+-- *
+-- * This program and the accompanying materials are made available under the
+-- * terms of the Eclipse Public License v. 2.0 which is available at
+-- * http://www.eclipse.org/legal/epl-2.0.
+-- *
+-- * SPDX-License-Identifier: EPL-2.0
+-- *******************************************************************************
+-----------------------------------------------------------------------------------
 --Add Table REF_BRANCH_LEVEL with UPDATE- INSERT- and DELETE-Triggers and INSERT Values;
 --Add Table HREF_BRANCH_LEVEL;
 --INSERT Values for Table REF_BRANCH
diff --git a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
index 6a5c1a7..4a53a17 100644
--- a/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
+++ b/src/main/asciidoc/architectureDocumentation/architectureDocumentation.adoc
@@ -1,13 +1,16 @@
 ﻿////
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 ////
 openKonsequenz - Architecture of the module 'Planned Grid Measures'
 ===================================================================
diff --git a/src/main/asciidoc/howto/howtoBuild.adoc b/src/main/asciidoc/howto/howtoBuild.adoc
index bdf60a7..93afdec 100644
--- a/src/main/asciidoc/howto/howtoBuild.adoc
+++ b/src/main/asciidoc/howto/howtoBuild.adoc
@@ -1,13 +1,16 @@
 ////
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 ////
 = openKonsequenz - How to build the module "plannedGridMeasures@openK"
 :Date: 2017-11-17
diff --git a/src/main/asciidoc/howto/howtoRun.adoc b/src/main/asciidoc/howto/howtoRun.adoc
index ca98764..79f7d3d 100644
--- a/src/main/asciidoc/howto/howtoRun.adoc
+++ b/src/main/asciidoc/howto/howtoRun.adoc
@@ -1,13 +1,16 @@
 ////
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 ////
 = openKonsequenz - How to run the module "Plannedgridmeasures"
 :Date: 2018-06-25
diff --git a/src/main/asciidoc/userDocumentation/userDocumentation.adoc b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
index 992b9a3..1094889 100644
--- a/src/main/asciidoc/userDocumentation/userDocumentation.adoc
+++ b/src/main/asciidoc/userDocumentation/userDocumentation.adoc
@@ -1,3 +1,18 @@
+////
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+////
+
 = Benutzerhandbuch: Geplante Netzmaßnahmen
 
 <<<
diff --git a/src/main/java/org/eclipse/openk/PlannedGridMeasuresApplication.java b/src/main/java/org/eclipse/openk/PlannedGridMeasuresApplication.java
index 30c0f8b..6762e11 100644
--- a/src/main/java/org/eclipse/openk/PlannedGridMeasuresApplication.java
+++ b/src/main/java/org/eclipse/openk/PlannedGridMeasuresApplication.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk;
 
 import io.dropwizard.Application;
diff --git a/src/main/java/org/eclipse/openk/PlannedGridMeasuresConfiguration.java b/src/main/java/org/eclipse/openk/PlannedGridMeasuresConfiguration.java
index ccb481b..f3e3ccb 100644
--- a/src/main/java/org/eclipse/openk/PlannedGridMeasuresConfiguration.java
+++ b/src/main/java/org/eclipse/openk/PlannedGridMeasuresConfiguration.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/BackendSettings.java b/src/main/java/org/eclipse/openk/api/BackendSettings.java
index 5a87a32..7bda29a 100644
--- a/src/main/java/org/eclipse/openk/api/BackendSettings.java
+++ b/src/main/java/org/eclipse/openk/api/BackendSettings.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/Branch.java b/src/main/java/org/eclipse/openk/api/Branch.java
index 802332b..2784962 100644
--- a/src/main/java/org/eclipse/openk/api/Branch.java
+++ b/src/main/java/org/eclipse/openk/api/Branch.java
@@ -1,11 +1,17 @@
 /*
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
- */
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
 
 package org.eclipse.openk.api;
 
diff --git a/src/main/java/org/eclipse/openk/api/BranchLevel.java b/src/main/java/org/eclipse/openk/api/BranchLevel.java
index 0d31ee6..207eb97 100644
--- a/src/main/java/org/eclipse/openk/api/BranchLevel.java
+++ b/src/main/java/org/eclipse/openk/api/BranchLevel.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/Calender.java b/src/main/java/org/eclipse/openk/api/Calender.java
index 9225e67..9de4d45 100644
--- a/src/main/java/org/eclipse/openk/api/Calender.java
+++ b/src/main/java/org/eclipse/openk/api/Calender.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/CostCenter.java b/src/main/java/org/eclipse/openk/api/CostCenter.java
index 39130d8..cc3958a 100644
--- a/src/main/java/org/eclipse/openk/api/CostCenter.java
+++ b/src/main/java/org/eclipse/openk/api/CostCenter.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -43,4 +47,4 @@
 
     public void setDescription(String description) { this.description = description; }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/api/Document.java b/src/main/java/org/eclipse/openk/api/Document.java
index 98d0e77..c4f14b1 100644
--- a/src/main/java/org/eclipse/openk/api/Document.java
+++ b/src/main/java/org/eclipse/openk/api/Document.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/FilterObject.java b/src/main/java/org/eclipse/openk/api/FilterObject.java
index d864173..7332f74 100644
--- a/src/main/java/org/eclipse/openk/api/FilterObject.java
+++ b/src/main/java/org/eclipse/openk/api/FilterObject.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 public class FilterObject {
diff --git a/src/main/java/org/eclipse/openk/api/GmStatus.java b/src/main/java/org/eclipse/openk/api/GmStatus.java
index 0e78a89..80a9808 100644
--- a/src/main/java/org/eclipse/openk/api/GmStatus.java
+++ b/src/main/java/org/eclipse/openk/api/GmStatus.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/GridMeasure.java b/src/main/java/org/eclipse/openk/api/GridMeasure.java
index 7d4ac8c..65b3832 100644
--- a/src/main/java/org/eclipse/openk/api/GridMeasure.java
+++ b/src/main/java/org/eclipse/openk/api/GridMeasure.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/HGridMeasure.java b/src/main/java/org/eclipse/openk/api/HGridMeasure.java
index 084bf3b..d38b5bf 100644
--- a/src/main/java/org/eclipse/openk/api/HGridMeasure.java
+++ b/src/main/java/org/eclipse/openk/api/HGridMeasure.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/Lock.java b/src/main/java/org/eclipse/openk/api/Lock.java
index 7aac61e..b0144b1 100644
--- a/src/main/java/org/eclipse/openk/api/Lock.java
+++ b/src/main/java/org/eclipse/openk/api/Lock.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/PowerSystemResource.java b/src/main/java/org/eclipse/openk/api/PowerSystemResource.java
index 2ced803..1b1fd3b 100644
--- a/src/main/java/org/eclipse/openk/api/PowerSystemResource.java
+++ b/src/main/java/org/eclipse/openk/api/PowerSystemResource.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.api;
 
diff --git a/src/main/java/org/eclipse/openk/api/RoleAccessDefinitionApi.java b/src/main/java/org/eclipse/openk/api/RoleAccessDefinitionApi.java
index 8180d19..c77fa6f 100644
--- a/src/main/java/org/eclipse/openk/api/RoleAccessDefinitionApi.java
+++ b/src/main/java/org/eclipse/openk/api/RoleAccessDefinitionApi.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 public class RoleAccessDefinitionApi {
diff --git a/src/main/java/org/eclipse/openk/api/SingleGridmeasure.java b/src/main/java/org/eclipse/openk/api/SingleGridmeasure.java
index 654546e..155c442 100644
--- a/src/main/java/org/eclipse/openk/api/SingleGridmeasure.java
+++ b/src/main/java/org/eclipse/openk/api/SingleGridmeasure.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/Steps.java b/src/main/java/org/eclipse/openk/api/Steps.java
index f811388..f249c34 100644
--- a/src/main/java/org/eclipse/openk/api/Steps.java
+++ b/src/main/java/org/eclipse/openk/api/Steps.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/Territory.java b/src/main/java/org/eclipse/openk/api/Territory.java
index 6c96785..790df1b 100644
--- a/src/main/java/org/eclipse/openk/api/Territory.java
+++ b/src/main/java/org/eclipse/openk/api/Territory.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/UserSettings.java b/src/main/java/org/eclipse/openk/api/UserSettings.java
index b9add87..bdb2918 100644
--- a/src/main/java/org/eclipse/openk/api/UserSettings.java
+++ b/src/main/java/org/eclipse/openk/api/UserSettings.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import org.eclipse.openk.common.mapper.generic.annotations.MapDbModelClass;
diff --git a/src/main/java/org/eclipse/openk/api/VersionInfo.java b/src/main/java/org/eclipse/openk/api/VersionInfo.java
index 955eeec..a179116 100644
--- a/src/main/java/org/eclipse/openk/api/VersionInfo.java
+++ b/src/main/java/org/eclipse/openk/api/VersionInfo.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/api/mail/Email.java b/src/main/java/org/eclipse/openk/api/mail/Email.java
index 34b7aa9..7f92331 100644
--- a/src/main/java/org/eclipse/openk/api/mail/Email.java
+++ b/src/main/java/org/eclipse/openk/api/mail/Email.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.api.mail;
 
diff --git a/src/main/java/org/eclipse/openk/api/mail/EmailTemplatePaths.java b/src/main/java/org/eclipse/openk/api/mail/EmailTemplatePaths.java
index 2bdebd2..aa48d04 100644
--- a/src/main/java/org/eclipse/openk/api/mail/EmailTemplatePaths.java
+++ b/src/main/java/org/eclipse/openk/api/mail/EmailTemplatePaths.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.api.mail;
 
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtAccount.java b/src/main/java/org/eclipse/openk/auth2/model/JwtAccount.java
index c726922..23b00d9 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtAccount.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtAccount.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 import java.util.List;
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtHeader.java b/src/main/java/org/eclipse/openk/auth2/model/JwtHeader.java
index 92ffc9c..9a74001 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtHeader.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtHeader.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 public class JwtHeader {
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtPayload.java b/src/main/java/org/eclipse/openk/auth2/model/JwtPayload.java
index 8ac07b4..f275da1 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtPayload.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtPayload.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtRealmAccess.java b/src/main/java/org/eclipse/openk/auth2/model/JwtRealmAccess.java
index 11fd349..e50ae56 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtRealmAccess.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtRealmAccess.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 import java.util.List;
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtResourceAccess.java b/src/main/java/org/eclipse/openk/auth2/model/JwtResourceAccess.java
index 9aa4710..43d9fb3 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtResourceAccess.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtResourceAccess.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 public class JwtResourceAccess {
diff --git a/src/main/java/org/eclipse/openk/auth2/model/JwtToken.java b/src/main/java/org/eclipse/openk/auth2/model/JwtToken.java
index b67e47a..7d1c318 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/JwtToken.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/JwtToken.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -40,4 +44,4 @@
     public void setRefreshExpiresIn(Integer refresh_expires_in) { this.refresh_expires_in = refresh_expires_in; } //NOSONAR
     public Integer getNotBeforePolicy() { return not_before_policy; }
     public void setNotBeforePolicy(Integer not_before_policy) { this.not_before_policy = not_before_policy; } //NOSONAR
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUser.java b/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUser.java
index 6d842d7..d0486c3 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUser.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUser.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 import java.util.List;
diff --git a/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUserAccess.java b/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUserAccess.java
index 1231352..4140c48 100644
--- a/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUserAccess.java
+++ b/src/main/java/org/eclipse/openk/auth2/model/KeyCloakUserAccess.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.model;
 
 public class KeyCloakUserAccess {
diff --git a/src/main/java/org/eclipse/openk/auth2/util/JwtHelper.java b/src/main/java/org/eclipse/openk/auth2/util/JwtHelper.java
index aa99a8d..2a9d872 100644
--- a/src/main/java/org/eclipse/openk/auth2/util/JwtHelper.java
+++ b/src/main/java/org/eclipse/openk/auth2/util/JwtHelper.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.auth2.util;
 
 import com.google.gson.JsonSyntaxException;
diff --git a/src/main/java/org/eclipse/openk/common/Globals.java b/src/main/java/org/eclipse/openk/common/Globals.java
index b689f9d..ec00305 100644
--- a/src/main/java/org/eclipse/openk/common/Globals.java
+++ b/src/main/java/org/eclipse/openk/common/Globals.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.common;
 
 public final class Globals {
diff --git a/src/main/java/org/eclipse/openk/common/GsonUTCDateAdapter.java b/src/main/java/org/eclipse/openk/common/GsonUTCDateAdapter.java
index f5da945..9d378d8 100644
--- a/src/main/java/org/eclipse/openk/common/GsonUTCDateAdapter.java
+++ b/src/main/java/org/eclipse/openk/common/GsonUTCDateAdapter.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.common;
 
 import com.google.gson.*;
@@ -55,4 +59,4 @@
             throw new JsonParseException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/common/JsonGeneratorBase.java b/src/main/java/org/eclipse/openk/common/JsonGeneratorBase.java
index 042c5fe..851577d 100644
--- a/src/main/java/org/eclipse/openk/common/JsonGeneratorBase.java
+++ b/src/main/java/org/eclipse/openk/common/JsonGeneratorBase.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.common;
 
 import com.google.gson.Gson;
diff --git a/src/main/java/org/eclipse/openk/common/mapper/GridMeasureMapper.java b/src/main/java/org/eclipse/openk/common/mapper/GridMeasureMapper.java
index 9571354..69aa8cb 100644
--- a/src/main/java/org/eclipse/openk/common/mapper/GridMeasureMapper.java
+++ b/src/main/java/org/eclipse/openk/common/mapper/GridMeasureMapper.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/main/java/org/eclipse/openk/common/mapper/generic/GenericApiToDbMapper.java b/src/main/java/org/eclipse/openk/common/mapper/generic/GenericApiToDbMapper.java
index 5e533c7..a0b1c20 100644
--- a/src/main/java/org/eclipse/openk/common/mapper/generic/GenericApiToDbMapper.java
+++ b/src/main/java/org/eclipse/openk/common/mapper/generic/GenericApiToDbMapper.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper.generic;
 
 import com.google.common.collect.Lists;
diff --git a/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelClass.java b/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelClass.java
index 6447b86..29942bb 100644
--- a/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelClass.java
+++ b/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelClass.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper.generic.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelField.java b/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelField.java
index 329a7ba..81ec878 100644
--- a/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelField.java
+++ b/src/main/java/org/eclipse/openk/common/mapper/generic/annotations/MapDbModelField.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper.generic.annotations;
 
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/org/eclipse/openk/common/util/DateUtils.java b/src/main/java/org/eclipse/openk/common/util/DateUtils.java
index 81e7786..3bbe456 100644
--- a/src/main/java/org/eclipse/openk/common/util/DateUtils.java
+++ b/src/main/java/org/eclipse/openk/common/util/DateUtils.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.common.util;
 
diff --git a/src/main/java/org/eclipse/openk/common/util/ResourceLoaderBase.java b/src/main/java/org/eclipse/openk/common/util/ResourceLoaderBase.java
index 65e6aa5..5413e23 100644
--- a/src/main/java/org/eclipse/openk/common/util/ResourceLoaderBase.java
+++ b/src/main/java/org/eclipse/openk/common/util/ResourceLoaderBase.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.common.util;
 
 import java.io.IOException;
diff --git a/src/main/java/org/eclipse/openk/common/util/SmallReflectionHelper.java b/src/main/java/org/eclipse/openk/common/util/SmallReflectionHelper.java
index cafe674..079985b 100644
--- a/src/main/java/org/eclipse/openk/common/util/SmallReflectionHelper.java
+++ b/src/main/java/org/eclipse/openk/common/util/SmallReflectionHelper.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.util;
 
 import java.lang.reflect.Field;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessException.java b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessException.java
index dc57591..0978a89 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessException.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessException.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public class ProcessException extends Exception {
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessGrid.java b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessGrid.java
index c81c87f..540a7e6 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessGrid.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessGrid.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 import java.util.HashMap;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessState.java b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessState.java
index df6da23..211631b 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessState.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessState.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public interface ProcessState {
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessSubject.java b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessSubject.java
index 707590f..995113e 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessSubject.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessSubject.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public interface ProcessSubject {
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessTask.java
index f5ad09b..90aab54 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/ProcessTask.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.base;
 
 import org.eclipse.openk.core.exceptions.HttpStatusException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/StateResolver.java b/src/main/java/org/eclipse/openk/core/bpmn/base/StateResolver.java
index 4751acc..8730338 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/StateResolver.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/StateResolver.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public interface StateResolver {
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTask.java
index 7672dcc..43aa1b4 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTask.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTask.java
index c9aaff6..547715c 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTask.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import java.util.EnumMap;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/EndPointTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/EndPointTask.java
index d972b17..53530fa 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/EndPointTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/EndPointTask.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTask.java
index 2229a40..c4191a4 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTask.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import com.rabbitmq.client.Channel;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTask.java b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTask.java
index b3c0228..a2d7f0c 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTask.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmGrid.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmGrid.java
index 0ace804..fed6f12 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmGrid.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmGrid.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure;
 
 import static org.eclipse.openk.api.BackendSettings.BpmnGridConfig.END_AFTER_APPROVED;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessState.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessState.java
index 45a8ee8..48ccd53 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessState.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessState.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubject.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubject.java
index 96a8e68..a50a331 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubject.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubject.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTask.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTask.java
index 2852435..45c0e35 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTask.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideAnotherSinglemeasure.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideAnotherSinglemeasure.java
index 97d03b8..c05dbfc 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideAnotherSinglemeasure.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideAnotherSinglemeasure.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApplied.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApplied.java
index f4410ff..047504a 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApplied.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApplied.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApproved.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApproved.java
index 418b9da..aa93ca1 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApproved.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureApproved.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureNotNeededOrRequested.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureNotNeededOrRequested.java
index 4bf88d4..f868760 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureNotNeededOrRequested.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureNotNeededOrRequested.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasurePossible.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasurePossible.java
index 161bfee..7eb48d5 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasurePossible.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasurePossible.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureReleased.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureReleased.java
index 40ab568..f33437a 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureReleased.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureReleased.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureSaved.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureSaved.java
index a2eebd5..078272f 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureSaved.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/DecideMeasureSaved.java
@@ -1,25 +1,19 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
-/*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- *
- *     http://www.eclipse.org/legal/epl-v10.html
- *
- ******************************************************************************
- */
+
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApproval.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApproval.java
index c5716a1..f81b3c0 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApproval.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApproval.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNew.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNew.java
index 5b94c08..5ff41a2 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNew.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNew.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceImportData.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceImportData.java
index 8c792a4..c3560d3 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceImportData.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceImportData.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApplied.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApplied.java
index fa34e38..66b3a3d 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApplied.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApplied.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQ.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQ.java
index 24a54cd..e3c17e2 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQ.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQ.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApproved.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApproved.java
index 1aa590d..5af32d7 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApproved.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApproved.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceled.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceled.java
index 7657592..f3f49f8 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceled.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceled.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosed.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosed.java
index 0d9be5a..d153465 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosed.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosed.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinished.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinished.java
index 26910f3..2b3cdc8 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinished.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinished.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApproval.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApproval.java
index f7f9be1..8829014 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApproval.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApproval.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejected.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejected.java
index 2941385..dd9c449 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejected.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejected.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleased.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleased.java
index dee089f..69ba1f8 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleased.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleased.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequested.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequested.java
index 48aaaf7..b0fe3c1 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequested.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequested.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import javax.mail.MessagingException;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTask.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTask.java
index ff52524..9c0313d 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTask.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTask.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTask.java
index 054288f..208d91c 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTask.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTask.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelper.java b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelper.java
index d55c9bd..9156a8a 100644
--- a/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelper.java
+++ b/src/main/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelper.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks.util;
 
 import java.text.DateFormat;
diff --git a/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java b/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
index c9a8de6..6a63946 100644
--- a/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
+++ b/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.communication;
 
 import java.io.IOException;
diff --git a/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java b/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java
index 0ca2693..0ba7714 100644
--- a/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java
+++ b/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import static org.eclipse.openk.common.JsonGeneratorBase.getGson;
diff --git a/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java b/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
index cda16a0..620d2e6 100644
--- a/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
+++ b/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 import java.io.IOException;
diff --git a/src/main/java/org/eclipse/openk/core/controller/EmailManager.java b/src/main/java/org/eclipse/openk/core/controller/EmailManager.java
index 58e4f0c..08d79c7 100644
--- a/src/main/java/org/eclipse/openk/core/controller/EmailManager.java
+++ b/src/main/java/org/eclipse/openk/core/controller/EmailManager.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.controller;
 
diff --git a/src/main/java/org/eclipse/openk/core/controller/GridConfigButtonManipulator.java b/src/main/java/org/eclipse/openk/core/controller/GridConfigButtonManipulator.java
index 479e46f..3b9d6b3 100644
--- a/src/main/java/org/eclipse/openk/core/controller/GridConfigButtonManipulator.java
+++ b/src/main/java/org/eclipse/openk/core/controller/GridConfigButtonManipulator.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/controller/GridMeasureBackendController.java b/src/main/java/org/eclipse/openk/core/controller/GridMeasureBackendController.java
index dd2007e..70de9ca 100644
--- a/src/main/java/org/eclipse/openk/core/controller/GridMeasureBackendController.java
+++ b/src/main/java/org/eclipse/openk/core/controller/GridMeasureBackendController.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.apache.commons.codec.binary.Base64;
diff --git a/src/main/java/org/eclipse/openk/core/controller/InitMailAddressCacheJob.java b/src/main/java/org/eclipse/openk/core/controller/InitMailAddressCacheJob.java
index d5e6034..5cdcddc 100644
--- a/src/main/java/org/eclipse/openk/core/controller/InitMailAddressCacheJob.java
+++ b/src/main/java/org/eclipse/openk/core/controller/InitMailAddressCacheJob.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.controller;
 
diff --git a/src/main/java/org/eclipse/openk/core/controller/InitRabbitMqSetup.java b/src/main/java/org/eclipse/openk/core/controller/InitRabbitMqSetup.java
index c883dfd..0570d9b 100644
--- a/src/main/java/org/eclipse/openk/core/controller/InitRabbitMqSetup.java
+++ b/src/main/java/org/eclipse/openk/core/controller/InitRabbitMqSetup.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.controller;
 
diff --git a/src/main/java/org/eclipse/openk/core/controller/MailAddressCache.java b/src/main/java/org/eclipse/openk/core/controller/MailAddressCache.java
index f9a0c95..b7cebc5 100644
--- a/src/main/java/org/eclipse/openk/core/controller/MailAddressCache.java
+++ b/src/main/java/org/eclipse/openk/core/controller/MailAddressCache.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import java.util.ArrayList;
diff --git a/src/main/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTask.java b/src/main/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTask.java
index 394b8b5..e4ce2ee 100644
--- a/src/main/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTask.java
+++ b/src/main/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTask.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.controller;
 
@@ -70,4 +74,4 @@
     protected TblGridMeasureDao createTblGridMeasureDao(EntityManager em) { return new TblGridMeasureDao(em); }
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/core/controller/MasterDataBackendController.java b/src/main/java/org/eclipse/openk/core/controller/MasterDataBackendController.java
index fb72019..5eedc3e 100644
--- a/src/main/java/org/eclipse/openk/core/controller/MasterDataBackendController.java
+++ b/src/main/java/org/eclipse/openk/core/controller/MasterDataBackendController.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/core/controller/PgmEmail.java b/src/main/java/org/eclipse/openk/core/controller/PgmEmail.java
index 0f1083a..c113100 100644
--- a/src/main/java/org/eclipse/openk/core/controller/PgmEmail.java
+++ b/src/main/java/org/eclipse/openk/core/controller/PgmEmail.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.controller;
 
diff --git a/src/main/java/org/eclipse/openk/core/controller/ResponseBuilderWrapper.java b/src/main/java/org/eclipse/openk/core/controller/ResponseBuilderWrapper.java
index 259b7ab..a885818 100644
--- a/src/main/java/org/eclipse/openk/core/controller/ResponseBuilderWrapper.java
+++ b/src/main/java/org/eclipse/openk/core/controller/ResponseBuilderWrapper.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/org/eclipse/openk/core/controller/RoleAccessDefinitions.java b/src/main/java/org/eclipse/openk/core/controller/RoleAccessDefinitions.java
index f64a556..c585dcf 100644
--- a/src/main/java/org/eclipse/openk/core/controller/RoleAccessDefinitions.java
+++ b/src/main/java/org/eclipse/openk/core/controller/RoleAccessDefinitions.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.eclipse.openk.api.RoleAccessDefinitionApi;
diff --git a/src/main/java/org/eclipse/openk/core/controller/TokenManager.java b/src/main/java/org/eclipse/openk/core/controller/TokenManager.java
index a8dc950..f795c99 100644
--- a/src/main/java/org/eclipse/openk/core/controller/TokenManager.java
+++ b/src/main/java/org/eclipse/openk/core/controller/TokenManager.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 
diff --git a/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java b/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
index 0ecdf6c..3d449e5 100644
--- a/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
+++ b/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 public class HttpStatusException extends Exception {
diff --git a/src/main/java/org/eclipse/openk/core/exceptions/PgmExceptionMapper.java b/src/main/java/org/eclipse/openk/core/exceptions/PgmExceptionMapper.java
index 8e73092..043f44c 100644
--- a/src/main/java/org/eclipse/openk/core/exceptions/PgmExceptionMapper.java
+++ b/src/main/java/org/eclipse/openk/core/exceptions/PgmExceptionMapper.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 import org.apache.http.HttpStatus;
diff --git a/src/main/java/org/eclipse/openk/core/exceptions/PgmNestedException.java b/src/main/java/org/eclipse/openk/core/exceptions/PgmNestedException.java
index 00ad0cd..7aab13f 100644
--- a/src/main/java/org/eclipse/openk/core/exceptions/PgmNestedException.java
+++ b/src/main/java/org/eclipse/openk/core/exceptions/PgmNestedException.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 import org.eclipse.openk.core.viewmodel.ErrorReturn;
diff --git a/src/main/java/org/eclipse/openk/core/messagebroker/MessageBroker.java b/src/main/java/org/eclipse/openk/core/messagebroker/MessageBroker.java
index 64c3f44..a1c6d0b 100644
--- a/src/main/java/org/eclipse/openk/core/messagebroker/MessageBroker.java
+++ b/src/main/java/org/eclipse/openk/core/messagebroker/MessageBroker.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.messagebroker;
 
diff --git a/src/main/java/org/eclipse/openk/core/messagebroker/Producer.java b/src/main/java/org/eclipse/openk/core/messagebroker/Producer.java
index 8f91e03..5f0a045 100644
--- a/src/main/java/org/eclipse/openk/core/messagebroker/Producer.java
+++ b/src/main/java/org/eclipse/openk/core/messagebroker/Producer.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.messagebroker;
 
diff --git a/src/main/java/org/eclipse/openk/core/viewmodel/ErrorReturn.java b/src/main/java/org/eclipse/openk/core/viewmodel/ErrorReturn.java
index 021407b..7e71745 100644
--- a/src/main/java/org/eclipse/openk/core/viewmodel/ErrorReturn.java
+++ b/src/main/java/org/eclipse/openk/core/viewmodel/ErrorReturn.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.viewmodel;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/core/viewmodel/GeneralReturnItem.java b/src/main/java/org/eclipse/openk/core/viewmodel/GeneralReturnItem.java
index c3480a7..f12f253 100644
--- a/src/main/java/org/eclipse/openk/core/viewmodel/GeneralReturnItem.java
+++ b/src/main/java/org/eclipse/openk/core/viewmodel/GeneralReturnItem.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.viewmodel;
 
 
diff --git a/src/main/java/org/eclipse/openk/db/dao/AutoCloseEntityManager.java b/src/main/java/org/eclipse/openk/db/dao/AutoCloseEntityManager.java
index ee158a9..0af674d 100644
--- a/src/main/java/org/eclipse/openk/db/dao/AutoCloseEntityManager.java
+++ b/src/main/java/org/eclipse/openk/db/dao/AutoCloseEntityManager.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.dao;
 
 import java.util.List;
diff --git a/src/main/java/org/eclipse/openk/db/dao/EntityHelper.java b/src/main/java/org/eclipse/openk/db/dao/EntityHelper.java
index 7771061..0ae5546 100644
--- a/src/main/java/org/eclipse/openk/db/dao/EntityHelper.java
+++ b/src/main/java/org/eclipse/openk/db/dao/EntityHelper.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.dao;
 
 import java.util.Map;
diff --git a/src/main/java/org/eclipse/openk/db/dao/GenericDaoJpa.java b/src/main/java/org/eclipse/openk/db/dao/GenericDaoJpa.java
index 81d01b6..9fe1353 100644
--- a/src/main/java/org/eclipse/openk/db/dao/GenericDaoJpa.java
+++ b/src/main/java/org/eclipse/openk/db/dao/GenericDaoJpa.java
@@ -1,16 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-*
-*     http://www.eclipse.org/legal/epl-v10.html
-*
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
 
-
 package org.eclipse.openk.db.dao;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/dao/HTblGridMeasureDao.java b/src/main/java/org/eclipse/openk/db/dao/HTblGridMeasureDao.java
index 19ac929..842b5e8 100644
--- a/src/main/java/org/eclipse/openk/db/dao/HTblGridMeasureDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/HTblGridMeasureDao.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.HTblGridMeasure;
@@ -39,4 +43,4 @@
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefBranchDao.java b/src/main/java/org/eclipse/openk/db/dao/RefBranchDao.java
index c198058..969beb3 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefBranchDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefBranchDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.RefBranch;
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefBranchLevelDao.java b/src/main/java/org/eclipse/openk/db/dao/RefBranchLevelDao.java
index bb53751..1903ba0 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefBranchLevelDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefBranchLevelDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.RefBranchLevel;
@@ -48,4 +52,4 @@
             return null; // NOSONAR We decide to use null logic
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefCostCenterDao.java b/src/main/java/org/eclipse/openk/db/dao/RefCostCenterDao.java
index 6d37abe..f6fe72d 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefCostCenterDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefCostCenterDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.RefCostCenter;
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefGmStatusDao.java b/src/main/java/org/eclipse/openk/db/dao/RefGmStatusDao.java
index a3da06e..b43e93b 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefGmStatusDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefGmStatusDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.RefGmStatus;
@@ -36,4 +40,4 @@
             return null; // NOSONAR We decide to use null logic
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefTerritoryDao.java b/src/main/java/org/eclipse/openk/db/dao/RefTerritoryDao.java
index 71c3b0d..5fc726f 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefTerritoryDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefTerritoryDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.RefTerritory;
diff --git a/src/main/java/org/eclipse/openk/db/dao/RefVersionDao.java b/src/main/java/org/eclipse/openk/db/dao/RefVersionDao.java
index 564ad9b..1e83e83 100644
--- a/src/main/java/org/eclipse/openk/db/dao/RefVersionDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/RefVersionDao.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.dao;
 
 import javax.persistence.EntityManager;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblDocumentsDao.java b/src/main/java/org/eclipse/openk/db/dao/TblDocumentsDao.java
index d746b4b..cc247f3 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblDocumentsDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblDocumentsDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import javax.persistence.EntityManager;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblGridMeasureDao.java b/src/main/java/org/eclipse/openk/db/dao/TblGridMeasureDao.java
index fe53793..dd0d831 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblGridMeasureDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblGridMeasureDao.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.core.bpmn.gridmeasure.PlgmProcessState;
@@ -187,4 +191,4 @@
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblIdCounterDao.java b/src/main/java/org/eclipse/openk/db/dao/TblIdCounterDao.java
index 49e0d66..8a7d6ff 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblIdCounterDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblIdCounterDao.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import java.util.List;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblLockDao.java b/src/main/java/org/eclipse/openk/db/dao/TblLockDao.java
index 7214bbe..9fcc569 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblLockDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblLockDao.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.TblLock;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblMeasureDocumentsDao.java b/src/main/java/org/eclipse/openk/db/dao/TblMeasureDocumentsDao.java
index deeb2f4..6e47f62 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblMeasureDocumentsDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblMeasureDocumentsDao.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.apache.http.HttpStatus;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblSingleGridmeasureDao.java b/src/main/java/org/eclipse/openk/db/dao/TblSingleGridmeasureDao.java
index 8d492c8..7c18d37 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblSingleGridmeasureDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblSingleGridmeasureDao.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.TblSingleGridmeasure;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblStepsDao.java b/src/main/java/org/eclipse/openk/db/dao/TblStepsDao.java
index 827da88..f6c86fa 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblStepsDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblStepsDao.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.eclipse.openk.db.model.TblSteps;
diff --git a/src/main/java/org/eclipse/openk/db/dao/TblUserSettingsDao.java b/src/main/java/org/eclipse/openk/db/dao/TblUserSettingsDao.java
index 884e7f3..e4df0dc 100644
--- a/src/main/java/org/eclipse/openk/db/dao/TblUserSettingsDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/TblUserSettingsDao.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.dao;
 
 import org.apache.http.HttpStatus;
diff --git a/src/main/java/org/eclipse/openk/db/dao/interfaces/IGenericDao.java b/src/main/java/org/eclipse/openk/db/dao/interfaces/IGenericDao.java
index 332f8d6..07900bc 100644
--- a/src/main/java/org/eclipse/openk/db/dao/interfaces/IGenericDao.java
+++ b/src/main/java/org/eclipse/openk/db/dao/interfaces/IGenericDao.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.dao.interfaces;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/HTblGridMeasure.java b/src/main/java/org/eclipse/openk/db/model/HTblGridMeasure.java
index 92e5daa8..8318fd0 100644
--- a/src/main/java/org/eclipse/openk/db/model/HTblGridMeasure.java
+++ b/src/main/java/org/eclipse/openk/db/model/HTblGridMeasure.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import javax.persistence.Column;
diff --git a/src/main/java/org/eclipse/openk/db/model/RefBranch.java b/src/main/java/org/eclipse/openk/db/model/RefBranch.java
index 7eb9d78..b5b87e9 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefBranch.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefBranch.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
@@ -89,4 +93,4 @@
     public Date getModDate() { return modDate; }
 
     public void setModDate(Date modDate) { this.modDate = modDate; }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/model/RefBranchLevel.java b/src/main/java/org/eclipse/openk/db/model/RefBranchLevel.java
index fe613d0..aa902a9 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefBranchLevel.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefBranchLevel.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/RefCostCenter.java b/src/main/java/org/eclipse/openk/db/model/RefCostCenter.java
index 68fb572..7549fee 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefCostCenter.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefCostCenter.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/RefGmStatus.java b/src/main/java/org/eclipse/openk/db/model/RefGmStatus.java
index 7c9eadc..b0fae81 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefGmStatus.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefGmStatus.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
@@ -82,4 +86,4 @@
     public Date getModDate() { return modDate; }
 
     public void setModDate(Date modDate) { this.modDate = modDate; }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/model/RefTerritory.java b/src/main/java/org/eclipse/openk/db/model/RefTerritory.java
index c87b6da..2b6e0b9 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefTerritory.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefTerritory.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/RefVersion.java b/src/main/java/org/eclipse/openk/db/model/RefVersion.java
index d58b13d..2d0b8c3 100644
--- a/src/main/java/org/eclipse/openk/db/model/RefVersion.java
+++ b/src/main/java/org/eclipse/openk/db/model/RefVersion.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
@@ -54,4 +58,4 @@
         this.version = version;
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/model/TblDocuments.java b/src/main/java/org/eclipse/openk/db/model/TblDocuments.java
index cbff55e..a9ce413 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblDocuments.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblDocuments.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblGridMeasure.java b/src/main/java/org/eclipse/openk/db/model/TblGridMeasure.java
index db85275..9a95aa2 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblGridMeasure.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblGridMeasure.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblIdCounter.java b/src/main/java/org/eclipse/openk/db/model/TblIdCounter.java
index ec2858d..8561f72 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblIdCounter.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblIdCounter.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblLock.java b/src/main/java/org/eclipse/openk/db/model/TblLock.java
index bf13e73..048478f 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblLock.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblLock.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import javax.persistence.*;
@@ -81,4 +85,4 @@
     public Date getModDate() { return modDate; }
 
     public void setModDate(Date modDate) { this.modDate = modDate; }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/db/model/TblMeasureDocuments.java b/src/main/java/org/eclipse/openk/db/model/TblMeasureDocuments.java
index 931cb01..583fb37 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblMeasureDocuments.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblMeasureDocuments.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblSingleGridmeasure.java b/src/main/java/org/eclipse/openk/db/model/TblSingleGridmeasure.java
index 9d5a0a7..b1389ab 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblSingleGridmeasure.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblSingleGridmeasure.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblSteps.java b/src/main/java/org/eclipse/openk/db/model/TblSteps.java
index 4a09f3d..a442f1c 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblSteps.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblSteps.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import javax.persistence.Column;
diff --git a/src/main/java/org/eclipse/openk/db/model/TblUserSettings.java b/src/main/java/org/eclipse/openk/db/model/TblUserSettings.java
index d4393cb..500fef6 100644
--- a/src/main/java/org/eclipse/openk/db/model/TblUserSettings.java
+++ b/src/main/java/org/eclipse/openk/db/model/TblUserSettings.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import java.io.Serializable;
diff --git a/src/main/java/org/eclipse/openk/health/DBIsPresentHealthCheck.java b/src/main/java/org/eclipse/openk/health/DBIsPresentHealthCheck.java
index 12b5566..83b1cee 100644
--- a/src/main/java/org/eclipse/openk/health/DBIsPresentHealthCheck.java
+++ b/src/main/java/org/eclipse/openk/health/DBIsPresentHealthCheck.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.health;
 
 import com.codahale.metrics.health.HealthCheck;
diff --git a/src/main/java/org/eclipse/openk/health/MailConfigurationHealthCheck.java b/src/main/java/org/eclipse/openk/health/MailConfigurationHealthCheck.java
index 0d5c3fc..868d6cf 100644
--- a/src/main/java/org/eclipse/openk/health/MailConfigurationHealthCheck.java
+++ b/src/main/java/org/eclipse/openk/health/MailConfigurationHealthCheck.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.health;
 
 import com.codahale.metrics.health.HealthCheck;
diff --git a/src/main/java/org/eclipse/openk/health/MailServerPresentHealthCheck.java b/src/main/java/org/eclipse/openk/health/MailServerPresentHealthCheck.java
index 3c9a708..f549de9 100644
--- a/src/main/java/org/eclipse/openk/health/MailServerPresentHealthCheck.java
+++ b/src/main/java/org/eclipse/openk/health/MailServerPresentHealthCheck.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.health;
 import com.codahale.metrics.health.HealthCheck;
 import org.eclipse.openk.core.controller.BackendConfig;
diff --git a/src/main/java/org/eclipse/openk/resources/BaseResource.java b/src/main/java/org/eclipse/openk/resources/BaseResource.java
index ba493c7..08df277 100644
--- a/src/main/java/org/eclipse/openk/resources/BaseResource.java
+++ b/src/main/java/org/eclipse/openk/resources/BaseResource.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 import org.apache.log4j.Logger;
diff --git a/src/main/java/org/eclipse/openk/resources/MasterDataResource.java b/src/main/java/org/eclipse/openk/resources/MasterDataResource.java
index 8ba0542..435cfed 100644
--- a/src/main/java/org/eclipse/openk/resources/MasterDataResource.java
+++ b/src/main/java/org/eclipse/openk/resources/MasterDataResource.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 import com.codahale.metrics.annotation.Timed;
diff --git a/src/main/java/org/eclipse/openk/resources/PlannedGridMeasuresResource.java b/src/main/java/org/eclipse/openk/resources/PlannedGridMeasuresResource.java
index 0d4068f..bc9eef7 100644
--- a/src/main/java/org/eclipse/openk/resources/PlannedGridMeasuresResource.java
+++ b/src/main/java/org/eclipse/openk/resources/PlannedGridMeasuresResource.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 
diff --git a/src/test/java/org/eclipse/openk/PlannedGridMeasuresApplicationTest.java b/src/test/java/org/eclipse/openk/PlannedGridMeasuresApplicationTest.java
index d8100ce..6b88f2b 100644
--- a/src/test/java/org/eclipse/openk/PlannedGridMeasuresApplicationTest.java
+++ b/src/test/java/org/eclipse/openk/PlannedGridMeasuresApplicationTest.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk;
 
 import static org.easymock.EasyMock.anyBoolean;
diff --git a/src/test/java/org/eclipse/openk/TestUtils/TestHelper.java b/src/test/java/org/eclipse/openk/TestUtils/TestHelper.java
index 6cec61f..7a985b0 100644
--- a/src/test/java/org/eclipse/openk/TestUtils/TestHelper.java
+++ b/src/test/java/org/eclipse/openk/TestUtils/TestHelper.java
@@ -1,14 +1,18 @@
 /*
- * *****************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *      http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * *****************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.TestUtils;
 
diff --git a/src/test/java/org/eclipse/openk/api/BackendSettingsTest.java b/src/test/java/org/eclipse/openk/api/BackendSettingsTest.java
index 31d71f5..e23956f 100644
--- a/src/test/java/org/eclipse/openk/api/BackendSettingsTest.java
+++ b/src/test/java/org/eclipse/openk/api/BackendSettingsTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 
diff --git a/src/test/java/org/eclipse/openk/api/BranchLevelTest.java b/src/test/java/org/eclipse/openk/api/BranchLevelTest.java
index 973ce7d..d9077b2 100644
--- a/src/test/java/org/eclipse/openk/api/BranchLevelTest.java
+++ b/src/test/java/org/eclipse/openk/api/BranchLevelTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/BranchTest.java b/src/test/java/org/eclipse/openk/api/BranchTest.java
index 2a3ab78..40143ca 100644
--- a/src/test/java/org/eclipse/openk/api/BranchTest.java
+++ b/src/test/java/org/eclipse/openk/api/BranchTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/CalenderTest.java b/src/test/java/org/eclipse/openk/api/CalenderTest.java
index 53831e8..68f0cf5 100644
--- a/src/test/java/org/eclipse/openk/api/CalenderTest.java
+++ b/src/test/java/org/eclipse/openk/api/CalenderTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/CostCenterTest.java b/src/test/java/org/eclipse/openk/api/CostCenterTest.java
index 8c60d92..d40b396 100644
--- a/src/test/java/org/eclipse/openk/api/CostCenterTest.java
+++ b/src/test/java/org/eclipse/openk/api/CostCenterTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/FilterObjectTest.java b/src/test/java/org/eclipse/openk/api/FilterObjectTest.java
index 3a3e64f..2585c83 100644
--- a/src/test/java/org/eclipse/openk/api/FilterObjectTest.java
+++ b/src/test/java/org/eclipse/openk/api/FilterObjectTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/eclipse/openk/api/GmStatusTest.java b/src/test/java/org/eclipse/openk/api/GmStatusTest.java
index a1047b5..1f8d7ca 100644
--- a/src/test/java/org/eclipse/openk/api/GmStatusTest.java
+++ b/src/test/java/org/eclipse/openk/api/GmStatusTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
@@ -58,4 +62,4 @@
         assertEquals(status.getColorCode(), status2.getColorCode());
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/eclipse/openk/api/GridmeasureTest.java b/src/test/java/org/eclipse/openk/api/GridmeasureTest.java
index 06779ec..fb631bc 100644
--- a/src/test/java/org/eclipse/openk/api/GridmeasureTest.java
+++ b/src/test/java/org/eclipse/openk/api/GridmeasureTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/HGridMeasureTest.java b/src/test/java/org/eclipse/openk/api/HGridMeasureTest.java
index e5549d7..b001204 100644
--- a/src/test/java/org/eclipse/openk/api/HGridMeasureTest.java
+++ b/src/test/java/org/eclipse/openk/api/HGridMeasureTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *            http://www.eclipse.org/legal/epl-v10.html
- *  
- * ***************************************************************************
- */
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/eclipse/openk/api/LockTest.java b/src/test/java/org/eclipse/openk/api/LockTest.java
index 4ae6676..6ea8b2b 100644
--- a/src/test/java/org/eclipse/openk/api/LockTest.java
+++ b/src/test/java/org/eclipse/openk/api/LockTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/RoleAccessDefinitionApiTest.java b/src/test/java/org/eclipse/openk/api/RoleAccessDefinitionApiTest.java
index fe9f425..4a9b840 100644
--- a/src/test/java/org/eclipse/openk/api/RoleAccessDefinitionApiTest.java
+++ b/src/test/java/org/eclipse/openk/api/RoleAccessDefinitionApiTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/eclipse/openk/api/SingleGridmeasureTest.java b/src/test/java/org/eclipse/openk/api/SingleGridmeasureTest.java
index 70ef4bd..fdae3bc 100644
--- a/src/test/java/org/eclipse/openk/api/SingleGridmeasureTest.java
+++ b/src/test/java/org/eclipse/openk/api/SingleGridmeasureTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/StepsTest.java b/src/test/java/org/eclipse/openk/api/StepsTest.java
index ab054f9..12f89e4 100644
--- a/src/test/java/org/eclipse/openk/api/StepsTest.java
+++ b/src/test/java/org/eclipse/openk/api/StepsTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
- *  
- *            http://www.eclipse.org/legal/epl-v10.html
- *  
- * ***************************************************************************
- */
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/eclipse/openk/api/TerritoryTest.java b/src/test/java/org/eclipse/openk/api/TerritoryTest.java
index b478bd6..785780d 100644
--- a/src/test/java/org/eclipse/openk/api/TerritoryTest.java
+++ b/src/test/java/org/eclipse/openk/api/TerritoryTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/UserSettingsTest.java b/src/test/java/org/eclipse/openk/api/UserSettingsTest.java
index 4984fd5..bced619 100644
--- a/src/test/java/org/eclipse/openk/api/UserSettingsTest.java
+++ b/src/test/java/org/eclipse/openk/api/UserSettingsTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/VersionInfoTest.java b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
index 2971544..2524b96 100644
--- a/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
+++ b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.api;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/api/mail/EmailTemplatePathsTest.java b/src/test/java/org/eclipse/openk/api/mail/EmailTemplatePathsTest.java
index f79485f..98580fb 100644
--- a/src/test/java/org/eclipse/openk/api/mail/EmailTemplatePathsTest.java
+++ b/src/test/java/org/eclipse/openk/api/mail/EmailTemplatePathsTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.api.mail;
 
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtAccountTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtAccountTest.java
index d8630ba..7f8fcce 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtAccountTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtAccountTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtHeaderTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtHeaderTest.java
index fe164b0..08b86c0 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtHeaderTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtHeaderTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtPayloadTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtPayloadTest.java
index 6150a22..0f4daa8 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtPayloadTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtPayloadTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtRealmAccessTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtRealmAccessTest.java
index 291fa2f..c30fc99 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtRealmAccessTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtRealmAccessTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtResourceAccessTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtResourceAccessTest.java
index 4f59585..a60bfb5 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtResourceAccessTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtResourceAccessTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/JwtTokenTest.java b/src/test/java/org/eclipse/openk/auth2/model/JwtTokenTest.java
index ba9ef71..eb2e326 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/JwtTokenTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/JwtTokenTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserAccessTest.java b/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserAccessTest.java
index 9eade0b..c76f231 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserAccessTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserAccessTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserTest.java b/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserTest.java
index 3dee860..be74e3b 100644
--- a/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/model/KeyCloakUserTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.model;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/auth2/util/JwtHelperTest.java b/src/test/java/org/eclipse/openk/auth2/util/JwtHelperTest.java
index 15e0358..c6fd099 100644
--- a/src/test/java/org/eclipse/openk/auth2/util/JwtHelperTest.java
+++ b/src/test/java/org/eclipse/openk/auth2/util/JwtHelperTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.auth2.util;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/eclipse/openk/common/GsonUTCDateAdapterTest.java b/src/test/java/org/eclipse/openk/common/GsonUTCDateAdapterTest.java
index 9dc9b72..bc4e835 100644
--- a/src/test/java/org/eclipse/openk/common/GsonUTCDateAdapterTest.java
+++ b/src/test/java/org/eclipse/openk/common/GsonUTCDateAdapterTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common;
 
 import com.google.gson.JsonSerializationContext;
@@ -37,4 +41,4 @@
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/eclipse/openk/common/mapper/GridMeasureMapperTest.java b/src/test/java/org/eclipse/openk/common/mapper/GridMeasureMapperTest.java
index 7609910..fb82859 100644
--- a/src/test/java/org/eclipse/openk/common/mapper/GridMeasureMapperTest.java
+++ b/src/test/java/org/eclipse/openk/common/mapper/GridMeasureMapperTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/test/java/org/eclipse/openk/common/mapper/generic/GenericApiToDBMapperTest.java b/src/test/java/org/eclipse/openk/common/mapper/generic/GenericApiToDBMapperTest.java
index 5e83ade..7937cd5 100644
--- a/src/test/java/org/eclipse/openk/common/mapper/generic/GenericApiToDBMapperTest.java
+++ b/src/test/java/org/eclipse/openk/common/mapper/generic/GenericApiToDBMapperTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.mapper.generic;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/common/util/ResourceLoaderBaseTest.java b/src/test/java/org/eclipse/openk/common/util/ResourceLoaderBaseTest.java
index da883f5..430f2d0 100644
--- a/src/test/java/org/eclipse/openk/common/util/ResourceLoaderBaseTest.java
+++ b/src/test/java/org/eclipse/openk/common/util/ResourceLoaderBaseTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.common.util;
 
 import static org.junit.Assert.assertNotNull;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/BaseTaskImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/BaseTaskImpl.java
index 78c7838..88f497e 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/BaseTaskImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/BaseTaskImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/DecisionTaskImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/DecisionTaskImpl.java
index bd62fd7..3743afc 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/DecisionTaskImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/DecisionTaskImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 import org.eclipse.openk.core.bpmn.base.tasks.DecisionTask;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessExceptionTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessExceptionTest.java
index f1a98c3..8214ad6 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessExceptionTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessExceptionTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessGridImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessGridImpl.java
index 9516bec..f7160a0 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessGridImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessGridImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 import org.eclipse.openk.core.bpmn.base.tasks.EndPointTask;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessStateImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessStateImpl.java
index e416ef6..f13f13d 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessStateImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/ProcessStateImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public enum ProcessStateImpl implements ProcessState {
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/ServiceTaskImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/ServiceTaskImpl.java
index d8551d7..af27fb2 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/ServiceTaskImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/ServiceTaskImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 import org.eclipse.openk.core.bpmn.base.tasks.ServiceTask;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/TestProcessSubject.java b/src/test/java/org/eclipse/openk/core/bpmn/base/TestProcessSubject.java
index 4a5141c..ea01f8f 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/TestProcessSubject.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/TestProcessSubject.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 public class TestProcessSubject implements ProcessSubject {
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/UserInteractionTaskImpl.java b/src/test/java/org/eclipse/openk/core/bpmn/base/UserInteractionTaskImpl.java
index 3175d56..c9c17c5 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/UserInteractionTaskImpl.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/UserInteractionTaskImpl.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base;
 
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTaskTest.java
index 4e65167..b2e1778 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/BaseTaskTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideAnotherSinglemeasureTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideAnotherSinglemeasureTest.java
index 17937b2..524cbbe 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideAnotherSinglemeasureTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideAnotherSinglemeasureTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureAppliedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureAppliedTest.java
index cd3994f..3cb2df5 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureAppliedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureAppliedTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureApprovedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureApprovedTest.java
index 1d7e2c5..93a9f16 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureApprovedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureApprovedTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureNotNeededOrRequestedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureNotNeededOrRequestedTest.java
index 8e36278..564a649 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureNotNeededOrRequestedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureNotNeededOrRequestedTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasurePossibleTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasurePossibleTest.java
index 42d8b93..7c4ec8a 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasurePossibleTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasurePossibleTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 import org.eclipse.openk.api.GridMeasure;
 import org.eclipse.openk.core.bpmn.base.ProcessException;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureReleasedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureReleasedTest.java
index 614d6f0..c7739f4 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureReleasedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureReleasedTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import org.eclipse.openk.api.GridMeasure;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureSavedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureSavedTest.java
index a94e614..ffdd2aa 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureSavedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecideMeasureSavedTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTaskTest.java
index f19f8b7..c742b26 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/DecisionTaskTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static org.eclipse.openk.core.bpmn.base.tasks.DecisionTask.OutputPort.NO;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/EndpointTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/EndpointTaskTest.java
index c13cbab..bd9981c 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/EndpointTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/EndpointTaskTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTaskTest.java
index f3b4f4b..3175a2a 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/ServiceTaskTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static org.junit.Assert.assertTrue;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTaskTest.java
index a8f9c0a..15722dc 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/base/tasks/UserInteractionTaskTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.base.tasks;
 
 import static org.junit.Assert.assertFalse;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubjectTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubjectTest.java
index cb6c61b..23ecb23 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubjectTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/PlgmProcessSubjectTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTaskTest.java
index 023e5b5..68e1c98 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ConfigDecisionTaskTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import org.eclipse.openk.TestUtils.TestHelper;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApprovalTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApprovalTest.java
index 5fc16c6..388226c 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApprovalTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureForApprovalTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNewTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNewTest.java
index 92f1ab1..26e65ec 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNewTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/MeasureNewTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import static junit.framework.TestCase.assertNotNull;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQTest.java
index 08fc82f..55d86e7 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedMessageQTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedTest.java
index a06020c..fd084c6 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureAppliedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApprovedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApprovedTest.java
index 335cb51..e56bdce 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApprovedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureApprovedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceledTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceledTest.java
index 2068561..616dfa9 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceledTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureCanceledTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosedTest.java
index dc9dce6..d55f0ec 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureClosedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinishedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinishedTest.java
index 7e02232..8074979 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinishedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureFinishedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApprovalTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApprovalTest.java
index 4f6127d..8ad2de0 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApprovalTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureForApprovalTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejectedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejectedTest.java
index 0087f6f..b9b0b6f 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejectedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRejectedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleasedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleasedTest.java
index 3eabd21..564996c 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleasedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureReleasedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequestedTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequestedTest.java
index a0c4ebf..c4bb40f 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequestedTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/ServiceMeasureRequestedTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTaskTest.java
index f5abb06..15b8a85 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/StoreStatusServiceTaskTest.java
@@ -1,15 +1,19 @@
-
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
+
 
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTaskTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTaskTest.java
index c759acc..cd40e7d 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/UIStoreMeasureTaskTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks;
 
 import static org.easymock.EasyMock.anyObject;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelperTest.java b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelperTest.java
index 00909fd..c32a78e 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelperTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/gridmeasure/tasks/util/GridMeasureStorageHelperTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.gridmeasure.tasks.util;
 
 import org.easymock.EasyMock;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessStateTest.java b/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessStateTest.java
index f32a4e4..476c262 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessStateTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessStateTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.plgm;
 
 import org.eclipse.openk.core.bpmn.gridmeasure.PlgmProcessState;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessSubjectTest.java b/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessSubjectTest.java
index 1ed212d..a7858d5 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessSubjectTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/plgm/PlgmProcessSubjectTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.bpmn.plgm;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/bpmn/plgm/ProcessGridTest.java b/src/test/java/org/eclipse/openk/core/bpmn/plgm/ProcessGridTest.java
index 174e3f9..c41f085 100644
--- a/src/test/java/org/eclipse/openk/core/bpmn/plgm/ProcessGridTest.java
+++ b/src/test/java/org/eclipse/openk/core/bpmn/plgm/ProcessGridTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.bpmn.plgm;
 
 import static junit.framework.TestCase.assertTrue;
diff --git a/src/test/java/org/eclipse/openk/core/communication/RestServiceWrapperTest.java b/src/test/java/org/eclipse/openk/core/communication/RestServiceWrapperTest.java
index 61377e7..54802ca 100644
--- a/src/test/java/org/eclipse/openk/core/communication/RestServiceWrapperTest.java
+++ b/src/test/java/org/eclipse/openk/core/communication/RestServiceWrapperTest.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2017-2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.communication;
 
 import org.eclipse.openk.core.exceptions.HttpStatusException;
diff --git a/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java b/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
index ab2a8fd..6479ac7 100644
--- a/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/controller/EmailmanagerTest.java b/src/test/java/org/eclipse/openk/core/controller/EmailmanagerTest.java
index 65a7e37..02fa73d 100644
--- a/src/test/java/org/eclipse/openk/core/controller/EmailmanagerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/EmailmanagerTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import com.icegreen.greenmail.util.GreenMail;
diff --git a/src/test/java/org/eclipse/openk/core/controller/GridConfigButtonManipulatorTest.java b/src/test/java/org/eclipse/openk/core/controller/GridConfigButtonManipulatorTest.java
index 55576a0..ca0166b 100644
--- a/src/test/java/org/eclipse/openk/core/controller/GridConfigButtonManipulatorTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/GridConfigButtonManipulatorTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.eclipse.openk.TestUtils.TestHelper;
diff --git a/src/test/java/org/eclipse/openk/core/controller/GridMeasureBackendControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/GridMeasureBackendControllerTest.java
index db8c5fd..bc691a5 100644
--- a/src/test/java/org/eclipse/openk/core/controller/GridMeasureBackendControllerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/GridMeasureBackendControllerTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import junit.framework.TestCase;
diff --git a/src/test/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTaskTest.java b/src/test/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTaskTest.java
index 84f93e4..546a27a 100644
--- a/src/test/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/MailAddressCacheTimerTaskTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.easymock.EasyMock;
diff --git a/src/test/java/org/eclipse/openk/core/controller/MasterDataBackendControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/MasterDataBackendControllerTest.java
index 7bb03cc..8b9636b 100644
--- a/src/test/java/org/eclipse/openk/core/controller/MasterDataBackendControllerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/MasterDataBackendControllerTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/controller/PgmEmailTest.java b/src/test/java/org/eclipse/openk/core/controller/PgmEmailTest.java
index 5f8f8fc..9bd3029 100644
--- a/src/test/java/org/eclipse/openk/core/controller/PgmEmailTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/PgmEmailTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.core.controller;
 
 import org.easymock.EasyMock;
diff --git a/src/test/java/org/eclipse/openk/core/controller/ResponseBuilderWrapperTest.java b/src/test/java/org/eclipse/openk/core/controller/ResponseBuilderWrapperTest.java
index 5d03a80..387c299 100644
--- a/src/test/java/org/eclipse/openk/core/controller/ResponseBuilderWrapperTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/ResponseBuilderWrapperTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/controller/TokenManagerTest.java b/src/test/java/org/eclipse/openk/core/controller/TokenManagerTest.java
index 2ce8f54..e296b85 100644
--- a/src/test/java/org/eclipse/openk/core/controller/TokenManagerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/TokenManagerTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.controller;
 
 import org.eclipse.openk.TestUtils.TestHelper;
diff --git a/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java b/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
index 541ef71..bdcce37 100644
--- a/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
+++ b/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionMapperTest.java b/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionMapperTest.java
index dfbad42..7884ce8 100644
--- a/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionMapperTest.java
+++ b/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionMapperTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 
diff --git a/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionsTest.java b/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionsTest.java
index b4b1a66..5448582 100644
--- a/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionsTest.java
+++ b/src/test/java/org/eclipse/openk/core/exceptions/PgmExceptionsTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.core.exceptions;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/db/model/HTblGridMeasureTest.java b/src/test/java/org/eclipse/openk/db/model/HTblGridMeasureTest.java
index 05af817..b9c4103 100644
--- a/src/test/java/org/eclipse/openk/db/model/HTblGridMeasureTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/HTblGridMeasureTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/db/model/RefBranchLevelTest.java b/src/test/java/org/eclipse/openk/db/model/RefBranchLevelTest.java
index 63c53f1..0bec77c 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefBranchLevelTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefBranchLevelTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/RefBranchTest.java b/src/test/java/org/eclipse/openk/db/model/RefBranchTest.java
index 21763ae..639a8cf 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefBranchTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefBranchTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/RefCostCenterTest.java b/src/test/java/org/eclipse/openk/db/model/RefCostCenterTest.java
index 3f72091..b09c6b4 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefCostCenterTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefCostCenterTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
@@ -50,4 +54,4 @@
         assertEquals("Mirko Modifier", refCostCenter.getModUser());
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/eclipse/openk/db/model/RefGmStatusTest.java b/src/test/java/org/eclipse/openk/db/model/RefGmStatusTest.java
index 5b43609..40a5c46 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefGmStatusTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefGmStatusTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/RefTerritoryTest.java b/src/test/java/org/eclipse/openk/db/model/RefTerritoryTest.java
index 2c8c712..90e3744 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefTerritoryTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefTerritoryTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/db/model/RefUserSettingsTest.java b/src/test/java/org/eclipse/openk/db/model/RefUserSettingsTest.java
index e4d21b9..a5c8200 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefUserSettingsTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefUserSettingsTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/db/model/RefVersionTest.java b/src/test/java/org/eclipse/openk/db/model/RefVersionTest.java
index 5d37e80..ec8346d 100644
--- a/src/test/java/org/eclipse/openk/db/model/RefVersionTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/RefVersionTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.db.model;
 
 import static org.junit.Assert.assertEquals;
@@ -30,4 +34,4 @@
         assertEquals("version54", refVersion.getVersion());
 
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/org/eclipse/openk/db/model/TblDocumentsTest.java b/src/test/java/org/eclipse/openk/db/model/TblDocumentsTest.java
index ef9ae4f..73a1d6f 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblDocumentsTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblDocumentsTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/TblGridMeasureTest.java b/src/test/java/org/eclipse/openk/db/model/TblGridMeasureTest.java
index b0e3696..1727bfc 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblGridMeasureTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblGridMeasureTest.java
@@ -1,14 +1,18 @@
-/**
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import static junit.framework.TestCase.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/db/model/TblIdCounterTest.java b/src/test/java/org/eclipse/openk/db/model/TblIdCounterTest.java
index 2ca7744..2ca6ac7 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblIdCounterTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblIdCounterTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/TblLockTest.java b/src/test/java/org/eclipse/openk/db/model/TblLockTest.java
index c1349dc..977efc2 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblLockTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblLockTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/TblMeasureDocumentsTest.java b/src/test/java/org/eclipse/openk/db/model/TblMeasureDocumentsTest.java
index fa953f2..cc89a26 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblMeasureDocumentsTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblMeasureDocumentsTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 
diff --git a/src/test/java/org/eclipse/openk/db/model/TblSingleGridMeasureTest.java b/src/test/java/org/eclipse/openk/db/model/TblSingleGridMeasureTest.java
index f5f1b06..b2a82eb 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblSingleGridMeasureTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblSingleGridMeasureTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/db/model/TblStepsTest.java b/src/test/java/org/eclipse/openk/db/model/TblStepsTest.java
index b9fc157..9993112 100644
--- a/src/test/java/org/eclipse/openk/db/model/TblStepsTest.java
+++ b/src/test/java/org/eclipse/openk/db/model/TblStepsTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.db.model;
 
 import org.junit.Test;
diff --git a/src/test/java/org/eclipse/openk/health/DBIsPresentHealthCheckTest.java b/src/test/java/org/eclipse/openk/health/DBIsPresentHealthCheckTest.java
index 3a95378..c8fed57 100644
--- a/src/test/java/org/eclipse/openk/health/DBIsPresentHealthCheckTest.java
+++ b/src/test/java/org/eclipse/openk/health/DBIsPresentHealthCheckTest.java
@@ -1,14 +1,18 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+/*
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.health;
 
 import static junit.framework.TestCase.assertFalse;
diff --git a/src/test/java/org/eclipse/openk/health/MailConfigurationHealthCheckTest.java b/src/test/java/org/eclipse/openk/health/MailConfigurationHealthCheckTest.java
index 7f9fc49..eeb9444 100644
--- a/src/test/java/org/eclipse/openk/health/MailConfigurationHealthCheckTest.java
+++ b/src/test/java/org/eclipse/openk/health/MailConfigurationHealthCheckTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.health;
 
diff --git a/src/test/java/org/eclipse/openk/health/MailServerPresentHealthCheckTest.java b/src/test/java/org/eclipse/openk/health/MailServerPresentHealthCheckTest.java
index cb55b13..eaee992 100644
--- a/src/test/java/org/eclipse/openk/health/MailServerPresentHealthCheckTest.java
+++ b/src/test/java/org/eclipse/openk/health/MailServerPresentHealthCheckTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 
 package org.eclipse.openk.health;
 
diff --git a/src/test/java/org/eclipse/openk/resources/MasterDataResourceTest.java b/src/test/java/org/eclipse/openk/resources/MasterDataResourceTest.java
index c116722..766ee05 100644
--- a/src/test/java/org/eclipse/openk/resources/MasterDataResourceTest.java
+++ b/src/test/java/org/eclipse/openk/resources/MasterDataResourceTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 import org.easymock.EasyMock;
diff --git a/src/test/java/org/eclipse/openk/resources/PlannedGridMeasureConfigurationTest.java b/src/test/java/org/eclipse/openk/resources/PlannedGridMeasureConfigurationTest.java
index 7363d9e..acf0393 100644
--- a/src/test/java/org/eclipse/openk/resources/PlannedGridMeasureConfigurationTest.java
+++ b/src/test/java/org/eclipse/openk/resources/PlannedGridMeasureConfigurationTest.java
@@ -1,14 +1,18 @@
 /*
- ******************************************************************************
- * Copyright © 2018 PTA GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *     http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- ******************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 import static org.junit.Assert.assertEquals;
diff --git a/src/test/java/org/eclipse/openk/resources/PlannedGridMeasuresResourcesTest.java b/src/test/java/org/eclipse/openk/resources/PlannedGridMeasuresResourcesTest.java
index f5df28c..e9ab81b 100644
--- a/src/test/java/org/eclipse/openk/resources/PlannedGridMeasuresResourcesTest.java
+++ b/src/test/java/org/eclipse/openk/resources/PlannedGridMeasuresResourcesTest.java
@@ -1,14 +1,18 @@
 /*
- * ***************************************************************************
- *  Copyright © 2018 PTA GmbH.
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v1.0
- *  which accompanies this distribution, and is available at
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
  *
- *            http://www.eclipse.org/legal/epl-v10.html
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
  *
- * ***************************************************************************
- */
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
+*/
+
 package org.eclipse.openk.resources;
 
 import org.eclipse.openk.TestUtils.TestHelper;
diff --git a/src/test/java/org/eclipse/openk/viewmodel/ErrorReturnTest.java b/src/test/java/org/eclipse/openk/viewmodel/ErrorReturnTest.java
index 864b211..9d83d0e 100644
--- a/src/test/java/org/eclipse/openk/viewmodel/ErrorReturnTest.java
+++ b/src/test/java/org/eclipse/openk/viewmodel/ErrorReturnTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.viewmodel;
 
 import static org.eclipse.openk.common.JsonGeneratorBase.getGson;
diff --git a/src/test/java/org/eclipse/openk/viewmodel/GeneralReturnItemTest.java b/src/test/java/org/eclipse/openk/viewmodel/GeneralReturnItemTest.java
index b866a5a..d36d8e7 100644
--- a/src/test/java/org/eclipse/openk/viewmodel/GeneralReturnItemTest.java
+++ b/src/test/java/org/eclipse/openk/viewmodel/GeneralReturnItemTest.java
@@ -1,14 +1,18 @@
 /*
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* 
-*     http://www.eclipse.org/legal/epl-v10.html
-* 
-******************************************************************************
+ *******************************************************************************
+ * Copyright (c) 2018 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *******************************************************************************
 */
+
 package org.eclipse.openk.viewmodel;
 
 import static org.junit.Assert.assertEquals;