GNM-1185 Legal Header EPL in Version 2 einf├╝gen
diff --git a/src/main/java/org/eclipse/openk/MicsCentralApplication.java b/src/main/java/org/eclipse/openk/MicsCentralApplication.java
index e0479a0..81f13ad 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) {date} 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..049c72c 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) {date} 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..f288bd2 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) {date} 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..f9c5227 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) {date} 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..2055f79 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) {date} 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..0e8dfa5 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) {date} 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..6a2d51c 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) {date} 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..dcf4a95 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) {date} 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..57eb9a1 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) {date} 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..228179e 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) {date} 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..27a67ce 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) {date} 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..e204d68 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) {date} 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..7ef3a25 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) {date} 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..22d77b2 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) {date} 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..46cae92 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) {date} 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..c5de55f 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) {date} 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..76a1584 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) {date} 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..8aa9082 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) {date} 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..d12ac0b 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) {date} 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..0ca4913 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) {date} 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..b40139b 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) {date} 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..539af32 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) {date} 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..f87f980 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) {date} 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..975b6f5 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) {date} 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..1478dc7 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) {date} 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..0abfaf2 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) {date} 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..67f5992 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) {date} 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..42c59f0 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) {date} 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..2eb0162 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) {date} 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..6a5c4c3 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) {date} 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..1c68c5d 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) {date} 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..9b65477 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) {date} 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..d130217 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) {date} 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..8e5bbf1 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) {date} 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..f056a32 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) {date} 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;