Remove 'All rights reserved.' on apache 2 license

- mvn license:remove
- update LICENSE.TXT
- mvn license:format

Change-Id: I2e7b1c78936b40a7cd181df7a1084535a09eac8c
Issue-ID: EXTAPI-53
Signed-off-by: MatthieuGeerebaert <matthieu.geerebaert@orange.com>

104 files changed, 105 insertions, 202 deletions

diff --git a/LICENSE.TXT b/LICENSE.TXT
index 38ee766..9a13a04 100644
--- a/LICENSE.TXT
+++ b/LICENSE.TXT
@@ -1,4 +1,4 @@
-    Copyright (c) 2017 Orange.  All rights reserved.
+    Copyright (c) 2018 Orange
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
diff --git a/pom.xml b/pom.xml
index 505777a..9066b0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-
-        Copyright (c) 2017 Orange.  All rights reserved.
+        Copyright (c) 2018 Orange
 
         Licensed under the Apache License, Version 2.0 (the "License");
         you may not use this file except in compliance with the License.
@@ -312,7 +311,7 @@
 			<plugin>
 			     <groupId>org.jacoco</groupId>
 			     <artifactId>jacoco-maven-plugin</artifactId>
-			     <version>0.7.7.201606060606</version>
+			     <version>0.8.1</version>
 			     <configuration>
 			          <dumpOnExit>true</dumpOnExit>
 			          <includes>
diff --git a/restclient/onap.http b/restclient/onap.http
index 846df6d..90f3d2f 100644
--- a/restclient/onap.http
+++ b/restclient/onap.http
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
diff --git a/restclient/serviceOrder.http b/restclient/serviceOrder.http
index f6d69b9..5496e89 100644
--- a/restclient/serviceOrder.http
+++ b/restclient/serviceOrder.http
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/Application.java b/src/main/java/org/onap/nbi/Application.java
index c9049c4..6a9bcbe 100644
--- a/src/main/java/org/onap/nbi/Application.java
+++ b/src/main/java/org/onap/nbi/Application.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
index 4fc8c67..989df02 100644
--- a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
+++ b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/RestConfiguration.java b/src/main/java/org/onap/nbi/apis/RestConfiguration.java
index 6a89539..d9e3206 100644
--- a/src/main/java/org/onap/nbi/apis/RestConfiguration.java
+++ b/src/main/java/org/onap/nbi/apis/RestConfiguration.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java b/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
index 701f01e..65d5b9c 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java
index 1034433..2d1b35f 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationResource.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
index 48988a0..e89960a 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ServiceSpecificationService.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
index bbd7a87..cc07f6f 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/ToscaInfosProcessor.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/FindServiceSpecJsonTransformer.java b/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/FindServiceSpecJsonTransformer.java
index 3ff812e..0046adb 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/FindServiceSpecJsonTransformer.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/FindServiceSpecJsonTransformer.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/GetServiceSpecJsonTransformer.java b/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/GetServiceSpecJsonTransformer.java
index a0f63df..d4c47a2 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/GetServiceSpecJsonTransformer.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/jolt/GetServiceSpecJsonTransformer.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/AaiClient.java b/src/main/java/org/onap/nbi/apis/serviceinventory/AaiClient.java
index 1a231a8..8fd3002 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/AaiClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/AaiClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/BaseClient.java b/src/main/java/org/onap/nbi/apis/serviceinventory/BaseClient.java
index 0ba6d04..c973f32 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/BaseClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/BaseClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/NbiClient.java b/src/main/java/org/onap/nbi/apis/serviceinventory/NbiClient.java
index 3f5d994..509bb7f 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/NbiClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/NbiClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryResource.java b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryResource.java
index c46ec14..26c9d98 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryResource.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryResource.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
index 808d43f..707c9e9 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/ServiceInventoryService.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/FindServiceInventoryJsonTransformer.java b/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/FindServiceInventoryJsonTransformer.java
index d836877..326248e 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/FindServiceInventoryJsonTransformer.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/FindServiceInventoryJsonTransformer.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/GetServiceInventoryJsonTransformer.java b/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/GetServiceInventoryJsonTransformer.java
index 3817b60..33a7edf 100644
--- a/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/GetServiceInventoryJsonTransformer.java
+++ b/src/main/java/org/onap/nbi/apis/serviceinventory/jolt/GetServiceInventoryJsonTransformer.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java b/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
index f4c9fe1..8c0b2be 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/MultiClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/MultiCriteriaRequestBuilder.java b/src/main/java/org/onap/nbi/apis/serviceorder/MultiCriteriaRequestBuilder.java
index 941d6c0..635be7c 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/MultiCriteriaRequestBuilder.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/MultiCriteriaRequestBuilder.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceCatalogUrl.java b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceCatalogUrl.java
index 1cedcf5..9831b67 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceCatalogUrl.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceCatalogUrl.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceInventoryUrl.java b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceInventoryUrl.java
index 978e77a..69b8f42 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceInventoryUrl.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceInventoryUrl.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
index 96e372c..4530528 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/ServiceOrderResource.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
index 98295cc..c3e41f4 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/SoClient.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ActionType.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ActionType.java
index cfd1d27..6f3499f 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ActionType.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ActionType.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/AppointmentRef.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/AppointmentRef.java
index e9bc104..8535e13 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/AppointmentRef.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/AppointmentRef.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ErrorRepresentation.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ErrorRepresentation.java
index 581939d..57e1872 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ErrorRepresentation.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ErrorRepresentation.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/Note.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/Note.java
index f51664f..edd485f 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/Note.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/Note.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRef.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRef.java
index ca3925f..c4860f1 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRef.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRef.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRelationship.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRelationship.java
index 23ee50e..ecb3116 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRelationship.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderItemRelationship.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderRelationship.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderRelationship.java
index 5e73de8..9732fe2 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderRelationship.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/OrderRelationship.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/Place.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/Place.java
index 133d389..dbd17bc 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/Place.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/Place.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/RelatedParty.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/RelatedParty.java
index a49f5b2..4f7474c 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/RelatedParty.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/RelatedParty.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/RelationshipType.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/RelationshipType.java
index c340949..2ebd3fb 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/RelationshipType.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/RelationshipType.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/Service.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/Service.java
index 0f9488d..8a65269 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/Service.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/Service.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceCharacteristic.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceCharacteristic.java
index 4d8d6ec..8b2c307 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceCharacteristic.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceCharacteristic.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrder.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrder.java
index e32fc26..e8d1e97 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrder.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrder.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrderItem.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrderItem.java
index 36bd635..e03713e 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrderItem.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceOrderItem.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRef.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRef.java
index 68ce155..e39abe6 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRef.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRef.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRelationship.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRelationship.java
index a682fb7..e8370e9 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRelationship.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceRelationship.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceSpecificationRef.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceSpecificationRef.java
index 6d3284a..33033b6 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceSpecificationRef.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/ServiceSpecificationRef.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/StateType.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/StateType.java
index 58a9e7d..764c7f1 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/StateType.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/StateType.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/TargetServiceSchema.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/TargetServiceSchema.java
index a987760..c0e2517 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/TargetServiceSchema.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/TargetServiceSchema.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/Value.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/Value.java
index 4ae4971..2f1fa7f 100755
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/Value.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/Value.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CloudConfiguration.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CloudConfiguration.java
index 3c17a6c..9cb6b40 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CloudConfiguration.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CloudConfiguration.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
index d4b7d6b..bfda46e 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/GetRequestStatusResponse.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/GetRequestStatusResponse.java
index 2684551..0f95e8d 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/GetRequestStatusResponse.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/GetRequestStatusResponse.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
index f2e97b6..3479f85 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/ModelInfo.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/Request.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/Request.java
index d9c205a..11298b9 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/Request.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/Request.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
index e8a258c..da5b1ad 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestDetails.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
index 083ff9d..6d3d5d5 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestInfo.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
index 7be6f05..31a1853 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestParameters.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java
index 2991771..2d0b7c9 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestState.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestState.java
index 62dcdc1..90ea666 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestState.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestState.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestStatus.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestStatus.java
index 1a3dc8d..27cfc96 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestStatus.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestStatus.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/SubscriberInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/SubscriberInfo.java
index 74db09e..3e0ce49 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/SubscriberInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/SubscriberInfo.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/UserParams.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/UserParams.java
index f5ce8e8..4bcdcb6 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/UserParams.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/UserParams.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ExecutionTask.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ExecutionTask.java
index 9c5585f..1aeab20 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ExecutionTask.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ExecutionTask.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfo.java
index 95db5ca..b873cdc 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfo.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfoJson.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfoJson.java
index c492ecb..cb22040 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfoJson.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderInfoJson.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderItemInfo.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderItemInfo.java
index 11fbc51..a6f3c84 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderItemInfo.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/orchestrator/ServiceOrderItemInfo.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ExecutionTaskRepository.java b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ExecutionTaskRepository.java
index ed52705..31f395a 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ExecutionTaskRepository.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ExecutionTaskRepository.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderInfoRepository.java b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderInfoRepository.java
index 4508fb4..f3eca16 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderInfoRepository.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderInfoRepository.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderRepository.java b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderRepository.java
index 29a54f0..aff55f9 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderRepository.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/repositories/ServiceOrderRepository.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ServiceOrderValidator.java b/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ServiceOrderValidator.java
index fedde49..92955e3 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ServiceOrderValidator.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ServiceOrderValidator.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ValidServiceOrder.java b/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ValidServiceOrder.java
index 07e34b9..eeb0bfc 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ValidServiceOrder.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/serviceordervalidator/ValidServiceOrder.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/utils/JsonEntityConverter.java b/src/main/java/org/onap/nbi/apis/serviceorder/utils/JsonEntityConverter.java
index eb22467..9e8d87e 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/utils/JsonEntityConverter.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/utils/JsonEntityConverter.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CheckOrderConsistenceManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CheckOrderConsistenceManager.java
index 67f03fc..1fb57ef 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CheckOrderConsistenceManager.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CheckOrderConsistenceManager.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAICustomerManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAICustomerManager.java
index 8eeb7c6..516444a 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAICustomerManager.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAICustomerManager.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java
index b12229b..f98eef5 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/CreateAAIServiceTypeManager.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java
index a09be70..c3f29b1 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskManager.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
index 2cbfd32..f1d7915 100644
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/status/StatusResource.java b/src/main/java/org/onap/nbi/apis/status/StatusResource.java
index 42883d2..7235d2c 100644
--- a/src/main/java/org/onap/nbi/apis/status/StatusResource.java
+++ b/src/main/java/org/onap/nbi/apis/status/StatusResource.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/status/StatusService.java b/src/main/java/org/onap/nbi/apis/status/StatusService.java
index d30f2a1..8f285bf 100644
--- a/src/main/java/org/onap/nbi/apis/status/StatusService.java
+++ b/src/main/java/org/onap/nbi/apis/status/StatusService.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/status/StatusServiceImpl.java b/src/main/java/org/onap/nbi/apis/status/StatusServiceImpl.java
index e53ce32..5a19e48 100644
--- a/src/main/java/org/onap/nbi/apis/status/StatusServiceImpl.java
+++ b/src/main/java/org/onap/nbi/apis/status/StatusServiceImpl.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/status/model/ApplicationStatus.java b/src/main/java/org/onap/nbi/apis/status/model/ApplicationStatus.java
index e452ed9..3e1a60f 100644
--- a/src/main/java/org/onap/nbi/apis/status/model/ApplicationStatus.java
+++ b/src/main/java/org/onap/nbi/apis/status/model/ApplicationStatus.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/apis/status/model/StatusType.java b/src/main/java/org/onap/nbi/apis/status/model/StatusType.java
index dbaf329..4b577d2 100644
--- a/src/main/java/org/onap/nbi/apis/status/model/StatusType.java
+++ b/src/main/java/org/onap/nbi/apis/status/model/StatusType.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/BeanUtils.java b/src/main/java/org/onap/nbi/commons/BeanUtils.java
index af174fd..9cab9f7 100644
--- a/src/main/java/org/onap/nbi/commons/BeanUtils.java
+++ b/src/main/java/org/onap/nbi/commons/BeanUtils.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/JacksonFilter.java b/src/main/java/org/onap/nbi/commons/JacksonFilter.java
index 2509e63..21628e0 100644
--- a/src/main/java/org/onap/nbi/commons/JacksonFilter.java
+++ b/src/main/java/org/onap/nbi/commons/JacksonFilter.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/JsonRepresentation.java b/src/main/java/org/onap/nbi/commons/JsonRepresentation.java
index 019d23b..7f1f1db 100644
--- a/src/main/java/org/onap/nbi/commons/JsonRepresentation.java
+++ b/src/main/java/org/onap/nbi/commons/JsonRepresentation.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/Query.java b/src/main/java/org/onap/nbi/commons/Query.java
index f6dda34..9821606 100644
--- a/src/main/java/org/onap/nbi/commons/Query.java
+++ b/src/main/java/org/onap/nbi/commons/Query.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/QueryParserUtils.java b/src/main/java/org/onap/nbi/commons/QueryParserUtils.java
index d360e8c..53a0e61 100644
--- a/src/main/java/org/onap/nbi/commons/QueryParserUtils.java
+++ b/src/main/java/org/onap/nbi/commons/QueryParserUtils.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/ReservedKeys.java b/src/main/java/org/onap/nbi/commons/ReservedKeys.java
index aabbe8b..e0fc952 100644
--- a/src/main/java/org/onap/nbi/commons/ReservedKeys.java
+++ b/src/main/java/org/onap/nbi/commons/ReservedKeys.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/Resource.java b/src/main/java/org/onap/nbi/commons/Resource.java
index 1379e29..768a771 100644
--- a/src/main/java/org/onap/nbi/commons/Resource.java
+++ b/src/main/java/org/onap/nbi/commons/Resource.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/commons/ResourceManagement.java b/src/main/java/org/onap/nbi/commons/ResourceManagement.java
index 46c5eb9..e90c2b0 100644
--- a/src/main/java/org/onap/nbi/commons/ResourceManagement.java
+++ b/src/main/java/org/onap/nbi/commons/ResourceManagement.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/ApiError.java b/src/main/java/org/onap/nbi/exceptions/ApiError.java
index cb06112..71111ea 100644
--- a/src/main/java/org/onap/nbi/exceptions/ApiError.java
+++ b/src/main/java/org/onap/nbi/exceptions/ApiError.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/ApiException.java b/src/main/java/org/onap/nbi/exceptions/ApiException.java
index 002c77e..f51d9d2 100644
--- a/src/main/java/org/onap/nbi/exceptions/ApiException.java
+++ b/src/main/java/org/onap/nbi/exceptions/ApiException.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/ApiExceptionHandler.java b/src/main/java/org/onap/nbi/exceptions/ApiExceptionHandler.java
index 8fce965..acc556e 100644
--- a/src/main/java/org/onap/nbi/exceptions/ApiExceptionHandler.java
+++ b/src/main/java/org/onap/nbi/exceptions/ApiExceptionHandler.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/BackendErrorHandler.java b/src/main/java/org/onap/nbi/exceptions/BackendErrorHandler.java
index 9f81e56..56496b8 100644
--- a/src/main/java/org/onap/nbi/exceptions/BackendErrorHandler.java
+++ b/src/main/java/org/onap/nbi/exceptions/BackendErrorHandler.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/BackendFunctionalException.java b/src/main/java/org/onap/nbi/exceptions/BackendFunctionalException.java
index 722e787..47257cc 100644
--- a/src/main/java/org/onap/nbi/exceptions/BackendFunctionalException.java
+++ b/src/main/java/org/onap/nbi/exceptions/BackendFunctionalException.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/TechnicalException.java b/src/main/java/org/onap/nbi/exceptions/TechnicalException.java
index f24fb8d..956a15a 100644
--- a/src/main/java/org/onap/nbi/exceptions/TechnicalException.java
+++ b/src/main/java/org/onap/nbi/exceptions/TechnicalException.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/java/org/onap/nbi/exceptions/ValidationException.java b/src/main/java/org/onap/nbi/exceptions/ValidationException.java
index 39348e5..e077333 100644
--- a/src/main/java/org/onap/nbi/exceptions/ValidationException.java
+++ b/src/main/java/org/onap/nbi/exceptions/ValidationException.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/main/resources/application-docker.properties b/src/main/resources/application-docker.properties
index 4a2a15e..098b43f 100644
--- a/src/main/resources/application-docker.properties
+++ b/src/main/resources/application-docker.properties
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
diff --git a/src/main/resources/application-localhost.properties b/src/main/resources/application-localhost.properties
index bc4d56d..f542f60 100644
--- a/src/main/resources/application-localhost.properties
+++ b/src/main/resources/application-localhost.properties
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 4917ece..4ddd54f 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/ApiTest.java b/src/test/java/org/onap/nbi/apis/ApiTest.java
index 259543c..c65f60b 100644
--- a/src/test/java/org/onap/nbi/apis/ApiTest.java
+++ b/src/test/java/org/onap/nbi/apis/ApiTest.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/ServiceOrderRepositoryTest.java b/src/test/java/org/onap/nbi/apis/ServiceOrderRepositoryTest.java
index 0832787..9c030bd 100644
--- a/src/test/java/org/onap/nbi/apis/ServiceOrderRepositoryTest.java
+++ b/src/test/java/org/onap/nbi/apis/ServiceOrderRepositoryTest.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/StatusResourceTest.java b/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
index fdd106b..d9309be 100644
--- a/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
+++ b/src/test/java/org/onap/nbi/apis/StatusResourceTest.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
index 5b68783..648241d 100644
--- a/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
+++ b/src/test/java/org/onap/nbi/apis/assertions/ServiceCatalogAssertions.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/assertions/ServiceInventoryAssertions.java b/src/test/java/org/onap/nbi/apis/assertions/ServiceInventoryAssertions.java
index 28a9686..56a6180 100644
--- a/src/test/java/org/onap/nbi/apis/assertions/ServiceInventoryAssertions.java
+++ b/src/test/java/org/onap/nbi/apis/assertions/ServiceInventoryAssertions.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/java/org/onap/nbi/apis/assertions/ServiceOrderAssertions.java b/src/test/java/org/onap/nbi/apis/assertions/ServiceOrderAssertions.java
index d21b016..feec313 100644
--- a/src/test/java/org/onap/nbi/apis/assertions/ServiceOrderAssertions.java
+++ b/src/test/java/org/onap/nbi/apis/assertions/ServiceOrderAssertions.java
@@ -1,6 +1,5 @@
 /**
- *
- *     Copyright (c) 2017 Orange.  All rights reserved.
+ *     Copyright (c) 2018 Orange
  *
  *     Licensed under the Apache License, Version 2.0 (the "License");
  *     you may not use this file except in compliance with the License.
diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties
index 743f438..0128997 100644
--- a/src/test/resources/application.properties
+++ b/src/test/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#     Copyright (c) 2017 Orange.  All rights reserved.
+#     Copyright (c) 2018 Orange
 #
 #     Licensed under the Apache License, Version 2.0 (the "License");
 #     you may not use this file except in compliance with the License.