aboutsummaryrefslogtreecommitdiffstats
path: root/aai-auth
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2018-03-21 09:14:41 -0400
committerKajur, Harish (vk250x) <vk250x@att.com>2018-03-22 01:16:47 -0400
commita9275b0c30881dac42f364ffca6f0d9cbff1b614 (patch)
treeb323217ddbb72c1bdedbabaacc9dcd20132ab6f4 /aai-auth
parent0cb1b4183290e9325eddaedb88b9f66d5cd01f4a (diff)
Update the license for 2017-2018 license
Issue-ID: AAI-856 Change-Id: I6711ff48314133abd7d03ea4b73a4f55606442bb Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'aai-auth')
-rw-r--r--aai-auth/LICENSE.TXT (renamed from aai-auth/License.txt)8
-rw-r--r--aai-auth/pom.xml37
-rw-r--r--aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java8
-rw-r--r--aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java8
-rw-r--r--aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java8
5 files changed, 30 insertions, 39 deletions
diff --git a/aai-auth/License.txt b/aai-auth/LICENSE.TXT
index df5d92ad..eb76ea4d 100644
--- a/aai-auth/License.txt
+++ b/aai-auth/LICENSE.TXT
@@ -1,9 +1,8 @@
============LICENSE_START=======================================================
-EcompAuth
+org.onap.aai
================================================================================
-Copyright © 2017 AT&T Intellectual Property.
+Copyright © 2017 AT&T Intellectual Property. All rights reserved.
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.
@@ -17,6 +16,3 @@ 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 and OpenECOMP are trademarks
-and service marks of AT&T Intellectual Property.
diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index 1a6190d9..902ec7fe 100644
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -1,3 +1,25 @@
+<!--
+
+ ============LICENSE_START=======================================================
+ org.onap.aai
+ ================================================================================
+ Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ Copyright © 2017-2018 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">
<modelVersion>4.0.0</modelVersion>
@@ -36,21 +58,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>
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java
index 2a4a7531..8f9b03d4 100644
--- a/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/Auth.java
@@ -1,10 +1,9 @@
/**
* ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* 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.
@@ -18,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
*/
package org.onap.aaiauth.auth;
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java
index a9d4ad54..2e9424c9 100644
--- a/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/auth/AuthCore.java
@@ -1,10 +1,9 @@
/**
* ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* 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.
@@ -18,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
*/
package org.onap.aaiauth.auth;
diff --git a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java
index 9d8786c3..15f8eba6 100644
--- a/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java
+++ b/aai-auth/src/main/java/org/onap/aaiauth/util/AuthConstants.java
@@ -1,10 +1,9 @@
/**
* ============LICENSE_START=======================================================
- * EcompAuth
+ * org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property.
+ * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
* 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.
@@ -18,9 +17,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
* ============LICENSE_END=========================================================
- *
- * ECOMP and OpenECOMP are trademarks
- * and service marks of AT&T Intellectual Property.
*/
package org.onap.aaiauth.util;