Merge branch 'dev'
diff --git a/org.eclipse.mdm.businessobjects/build.gradle b/org.eclipse.mdm.businessobjects/build.gradle
index 907425e..0757eb9 100644
--- a/org.eclipse.mdm.businessobjects/build.gradle
+++ b/org.eclipse.mdm.businessobjects/build.gradle
@@ -16,7 +16,7 @@
 
 dependencies {
   compile project(':org.eclipse.mdm.connector')	
-  compile 'com.fasterxml.jackson.core:jackson-databind:2.9.2'
+  compile 'com.fasterxml.jackson.core:jackson-databind:2.8.6'
 
   testCompile 'org.glassfish.jersey.test-framework.providers:jersey-test-framework-provider-grizzly2:2.23.2'
   testCompile 'org.glassfish.jersey.media:jersey-media-json-jackson:2.23.2'
diff --git a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java b/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java
index 2df5893..7016da3 100644
--- a/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java
+++ b/org.eclipse.mdm.connector/src/main/java/org/eclipse/mdm/connector/boundary/ConnectorServiceException.java
@@ -1,3 +1,11 @@
+/*
+ * Copyright (c) 2016-2018 Gigatronik Ingolstadt GmbH and others.
+ * All rights reserved. This program and 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.mdm.connector.boundary;
 
 public class ConnectorServiceException extends RuntimeException {
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java
index d6dc6fe..1899e48 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundary.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.boundary;

 

 import java.io.IOException;

diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
index c964081..8a75da6 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/MdmApiBoundary.java
@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) 2017-2018 Peak Solution GmbH and others
+ * All rights reserved. This program and 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.mdm.freetextindexer.boundary;
 
 import java.util.Collections;
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java
index 0fc38f5..fb8a7e0 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/boundary/package-info.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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

+ */

 /**

  * This package contains all communication to external systems. Those systems

  * are:

diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java
index cddf5ae..53bc72f 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/SetupIndex.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.control;

 

 import java.util.Map;

diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java
index ed3dea8..f5b8c86 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/UpdateIndex.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.control;

 

 import javax.ejb.EJB;

diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java
index 2217e05..63a6a7b 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/control/package-info.java
@@ -1,4 +1,8 @@
-/**

- * 

+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.control;

diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java
index afd2182..bcfc447 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntity.java
@@ -1,13 +1,10 @@
-/*******************************************************************************
-  * Copyright (c) 2016 Gigatronik Ingolstadt GmbH
-  * All rights reserved. This program and 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
-  *
-  * Contributors:
-  * Sebastian Dirsch - initial implementation
-  *******************************************************************************/
+/*
+ * Copyright (c) 2017-2018 Peak Solution GmbH and others
+ * All rights reserved. This program and 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.mdm.freetextindexer.entities;
 
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java
index 417c8ac..4e459e8 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponse.java
@@ -1,13 +1,10 @@
-/*******************************************************************************
-  * Copyright (c) 2016 Gigatronik Ingolstadt GmbH
-  * All rights reserved. This program and 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
-  *
-  * Contributors:
-  * Sebastian Dirsch - initial implementation
-  *******************************************************************************/
+/*
+ * Copyright (c) 2017-2018 Peak Solution GmbH and others
+ * All rights reserved. This program and 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.mdm.freetextindexer.entities;
 
diff --git a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java
index 41f3a64..4b231c7 100644
--- a/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java
+++ b/org.eclipse.mdm.freetextindexer/src/main/java/org/eclipse/mdm/freetextindexer/entities/package-info.java
@@ -1,4 +1,8 @@
-/**

- * 

+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.entities;

diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java
index 5130cea..a611508 100644
--- a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java
+++ b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/boundary/ElasticsearchBoundaryTest.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.boundary;

 

 import static org.junit.Assert.assertEquals;

diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java
index caddef1..2212ed6 100644
--- a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java
+++ b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/SetupIndexTest.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.control;

 

 import static org.mockito.ArgumentMatchers.any;

diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java
index 2fc4b40..9dafa0f 100644
--- a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java
+++ b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/control/UpdateIndexTest.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.control;

 

 import static org.mockito.Matchers.any;

diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java
index 5fa5112..50cca53 100644
--- a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java
+++ b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityResponseTest.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.entities;

 

 import static org.junit.Assert.assertNull;

diff --git a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java
index 136c990..e7b4bdc 100644
--- a/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java
+++ b/org.eclipse.mdm.freetextindexer/src/test/java/org/eclipse/mdm/freetextindexer/entities/MDMEntityTest.java
@@ -1,3 +1,10 @@
+/*

+ * Copyright (c) 2017-2018 Peak Solution GmbH and others

+ * All rights reserved. This program and 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.mdm.freetextindexer.entities;

 

 import static org.junit.Assert.assertFalse;