GNM-1226 Merge to master
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/src/main/java/org/eclipse/openk/MicsCentralApplication.java b/src/main/java/org/eclipse/openk/MicsCentralApplication.java
index e0479a0..3c96c52 100644
--- a/src/main/java/org/eclipse/openk/MicsCentralApplication.java
+++ b/src/main/java/org/eclipse/openk/MicsCentralApplication.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk;
diff --git a/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java b/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java
index df7c7b0..89d3ae5 100644
--- a/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java
+++ b/src/main/java/org/eclipse/openk/MicsCentralConfiguration.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk;
diff --git a/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java b/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java
index 5c5bc8b..d64a912 100644
--- a/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java
+++ b/src/main/java/org/eclipse/openk/api/ServiceDistributionCluster.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
index 61abca8..04c984d 100644
--- a/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
+++ b/src/main/java/org/eclipse/openk/api/ServiceRequestEnvelope.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/main/java/org/eclipse/openk/api/VersionInfo.java b/src/main/java/org/eclipse/openk/api/VersionInfo.java
index a5bc079..c26960c 100644
--- a/src/main/java/org/eclipse/openk/api/VersionInfo.java
+++ b/src/main/java/org/eclipse/openk/api/VersionInfo.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/main/java/org/eclipse/openk/core/common/Globals.java b/src/main/java/org/eclipse/openk/core/common/Globals.java
index 0331396..2e9e81e 100644
--- a/src/main/java/org/eclipse/openk/core/common/Globals.java
+++ b/src/main/java/org/eclipse/openk/core/common/Globals.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.common;
diff --git a/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java b/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java
index e284869..ead4b89 100644
--- a/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java
+++ b/src/main/java/org/eclipse/openk/core/common/GsonUTCDateAdapter.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.common;
@@ -44,4 +47,4 @@
             throw new JsonParseException(e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java b/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java
index 5f1a734..e059d26 100644
--- a/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java
+++ b/src/main/java/org/eclipse/openk/core/common/JsonGeneratorBase.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.common;
diff --git a/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java b/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java
index 0619003..07c0847 100644
--- a/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java
+++ b/src/main/java/org/eclipse/openk/core/common/util/ResourceLoaderBase.java
@@ -1,15 +1,21 @@
-/**
-******************************************************************************
-* Copyright © 2018 PTA GmbH.
-* All rights reserved. This program and the accompanying materials
-* are made available under the 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.common.util;
 
 import org.apache.commons.io.IOUtils;
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 1a16b9a..d980199 100644
--- a/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
+++ b/src/main/java/org/eclipse/openk/core/communication/RestServiceWrapper.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.communication;
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 1af2080..c600767 100644
--- a/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java
+++ b/src/main/java/org/eclipse/openk/core/controller/BackendConfig.java
@@ -1,4 +1,17 @@
-package org.eclipse.openk.core.controller;
+/*
+ *******************************************************************************
+ * 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;
 
 public class BackendConfig {
 
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 1d321f7..5f4931d 100644
--- a/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
+++ b/src/main/java/org/eclipse/openk/core/controller/BaseWebService.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/main/java/org/eclipse/openk/core/controller/CentralController.java b/src/main/java/org/eclipse/openk/core/controller/CentralController.java
index 7a48009..d3a2f42 100644
--- a/src/main/java/org/eclipse/openk/core/controller/CentralController.java
+++ b/src/main/java/org/eclipse/openk/core/controller/CentralController.java
@@ -1,16 +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
-* 
-******************************************************************************
-*/
-
-package org.eclipse.openk.core.controller;
+/*
+ *******************************************************************************
+ * 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.apache.log4j.Logger;
 import org.eclipse.jetty.http.HttpStatus;
diff --git a/src/main/java/org/eclipse/openk/core/controller/DispatchController.java b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java
index 68125bb..5e38477 100644
--- a/src/main/java/org/eclipse/openk/core/controller/DispatchController.java
+++ b/src/main/java/org/eclipse/openk/core/controller/DispatchController.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java b/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java
index 41642d0..0754fe9 100644
--- a/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java
+++ b/src/main/java/org/eclipse/openk/core/controller/InitServicesConfigCacheJob.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java b/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java
index fe6e12c..a08f50e 100644
--- a/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java
+++ b/src/main/java/org/eclipse/openk/core/controller/ServiceResolver.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java
index ea276d7..f66269e 100644
--- a/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java
+++ b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCache.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java
index 136a26f..e210dcb 100644
--- a/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java
+++ b/src/main/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTask.java
@@ -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
+ *******************************************************************************
 */
 
 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 f9348b7..35b233f 100644
--- a/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
+++ b/src/main/java/org/eclipse/openk/core/exceptions/HttpStatusException.java
@@ -1,16 +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
-* 
-******************************************************************************
-*/
-
-package org.eclipse.openk.core.exceptions;
+/*
+ *******************************************************************************
+ * 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 {
     private final int httpStatus;
diff --git a/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java b/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java
index 924d1e7..ec764e9 100644
--- a/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java
+++ b/src/main/java/org/eclipse/openk/health/ConfigFilePresentHealthCheck.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.health;
diff --git a/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java b/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java
index 61e62a1..f58caf6 100644
--- a/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java
+++ b/src/main/java/org/eclipse/openk/resources/MicsCentralResource.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.resources;
diff --git a/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java b/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java
index a8acd29..9c3348a 100644
--- a/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java
+++ b/src/test/java/org/eclipse/openk/MicsCentralApplicationTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk;
diff --git a/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java b/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java
index 21341a1..0d7a191 100644
--- a/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java
+++ b/src/test/java/org/eclipse/openk/api/ServiceDistributionClusterTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java
index 8e8258f..c486508 100644
--- a/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java
+++ b/src/test/java/org/eclipse/openk/api/ServiceRequestEnvelopeTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/test/java/org/eclipse/openk/api/VersionInfoTest.java b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
index fa9b197..53deb2b 100644
--- a/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
+++ b/src/test/java/org/eclipse/openk/api/VersionInfoTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.api;
diff --git a/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java b/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java
index 06c574c..7f66bbf 100644
--- a/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java
+++ b/src/test/java/org/eclipse/openk/core/common/GsonUTCDateAdapterTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.common;
diff --git a/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java b/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java
index 9247f87..fc56e0d 100644
--- a/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java
+++ b/src/test/java/org/eclipse/openk/core/common/util/ResourceLoaderBaseTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.common.util;
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 2b5ac28..117ff14 100644
--- a/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/BaseWebServiceTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/test/java/org/eclipse/openk/core/controller/CentralControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/CentralControllerTest.java
index cfd8e84..86be9f7 100644
--- a/src/test/java/org/eclipse/openk/core/controller/CentralControllerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/CentralControllerTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java b/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java
index 6d7aad3..a4cd6dc 100644
--- a/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/DispatchControllerTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java
index e699fca..4ebbed9 100644
--- a/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
diff --git a/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java
index e8f6557..c8887c0 100644
--- a/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java
+++ b/src/test/java/org/eclipse/openk/core/controller/ServicesConfigCacheTimerTaskTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.controller;
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 7ffc901..17866fd 100644
--- a/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
+++ b/src/test/java/org/eclipse/openk/core/exceptions/HttpStatusExceptionTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.core.exceptions;
diff --git a/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java b/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java
index 0ebe951..2179207 100644
--- a/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java
+++ b/src/test/java/org/eclipse/openk/health/ConfigFilePresentHealthCheckTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.health;
diff --git a/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java b/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java
index 4597aef..b60028e 100644
--- a/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java
+++ b/src/test/java/org/eclipse/openk/resources/MicsCentralResourceTest.java
@@ -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
+ *******************************************************************************
 */
 
 package org.eclipse.openk.resources;