From a9275b0c30881dac42f364ffca6f0d9cbff1b614 Mon Sep 17 00:00:00 2001
From: "Kajur, Harish (vk250x)" <vk250x@att.com>
Date: Wed, 21 Mar 2018 09:14:41 -0400
Subject: Update the license for 2017-2018 license

Issue-ID: AAI-856
Change-Id: I6711ff48314133abd7d03ea4b73a4f55606442bb
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
---
 aai-utils/LICENSE.TXT                              | 18 +++++++++++
 aai-utils/License.txt                              | 21 ------------
 aai-utils/pom.xml                                  | 37 +++++++++++++---------
 .../java/org/onap/aaiutils/oxm/OxmModelLoader.java |  6 ++--
 .../onap/aaiutils/oxm/OxmModelLoaderConstants.java |  6 ++--
 .../org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java  |  6 ++--
 6 files changed, 46 insertions(+), 48 deletions(-)
 create mode 100644 aai-utils/LICENSE.TXT
 delete mode 100644 aai-utils/License.txt

(limited to 'aai-utils')

diff --git a/aai-utils/LICENSE.TXT b/aai-utils/LICENSE.TXT
new file mode 100644
index 00000000..eb76ea4d
--- /dev/null
+++ b/aai-utils/LICENSE.TXT
@@ -0,0 +1,18 @@
+============LICENSE_START=======================================================
+org.onap.aai
+================================================================================
+Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+Copyright © 2017 Amdocs
+================================================================================
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+============LICENSE_END=========================================================
diff --git a/aai-utils/License.txt b/aai-utils/License.txt
deleted file mode 100644
index cdf6f180..00000000
--- a/aai-utils/License.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-============LICENSE_START=======================================================
-org.onap.aai
-================================================================================
-Copyright © 2017 AT&T Intellectual Property.
-Copyright © 2017 Amdocs
-All rights reserved.
-================================================================================
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-============LICENSE_END=========================================================
-
-ECOMP is a trademark and service mark of AT&T Intellectual Property.
diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index 5d50d7d3..4e97644a 100644
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+    Copyright © 2017 Amdocs
+    ================================================================================
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+    ============LICENSE_END=========================================================
+
+-->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -77,21 +99,6 @@
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <header>License.txt</header>
-                    <includes>
-                        <include>src/main/java/**</include>
-                    </includes>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>format</goal>
-                        </goals>
-                        <phase>process-sources</phase>
-                    </execution>
-                </executions>
             </plugin>
 
             <plugin>
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
index 9b78592e..4ced1b53 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoader.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
  * All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aaiutils.oxm;
 
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
index 0f8a54f5..8f24edb7 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderConstants.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
  * All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aaiutils.oxm;
 
diff --git a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
index 4f9a2688..48eeac0e 100644
--- a/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
+++ b/aai-utils/src/main/java/org/onap/aaiutils/oxm/OxmModelLoaderMsgs.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property.
+ * Copyright © 2017-2018 Amdocs
  * All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aaiutils.oxm;
 
-- 
cgit 1.2.3-korg