aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsblimkie <steven.blimkie@amdocs.com>2018-03-13 10:34:59 -0400
committersblimkie <steven.blimkie@amdocs.com>2018-03-13 10:37:07 -0400
commit7ccb07886bb396d60c87ad6e5df1cd5587e56fdd (patch)
tree1612f0ecc0e82ab6c360f15b15860106955b6e2c
parentb6a92cb90c29273973c0c10700928c88247a6860 (diff)
Update license date and text
Update license date and disable license plugin Issue-ID: AAI-868 Change-Id: I8f3a5bf9619dd036853be298a553337a8ce5e843 Signed-off-by: sblimkie <steven.blimkie@amdocs.com>
-rw-r--r--License.txt6
-rw-r--r--pom.xml23
-rw-r--r--src/main/java/org/onap/aai/restclient/client/Headers.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/client/OperationResult.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/client/RestClient.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/rest/HttpUtil.java6
-rw-r--r--src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java6
9 files changed, 39 insertions, 32 deletions
diff --git a/License.txt b/License.txt
index 09cff85..c97ccb2 100644
--- a/License.txt
+++ b/License.txt
@@ -1,8 +1,8 @@
============LICENSE_START=======================================================
org.onap.aai
================================================================================
-Copyright © 2017 AT&T Intellectual Property. All rights reserved.
-Copyright © 2017 Amdocs
+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.
@@ -16,5 +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 is a trademark and service mark of AT&T Intellectual Property. \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9f125ce..2de12e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,3 +1,24 @@
+<!--
+============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>
@@ -107,6 +128,7 @@
</pluginManagement>
<plugins>
<!-- license plugin -->
+ <!-- Uncomment this to add a license header to every source file
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
@@ -126,6 +148,7 @@
</execution>
</executions>
</plugin>
+ -->
<plugin>
<groupId>org.sonatype.plugins</groupId>
diff --git a/src/main/java/org/onap/aai/restclient/client/Headers.java b/src/main/java/org/onap/aai/restclient/client/Headers.java
index 56903bc..81f4ef6 100644
--- a/src/main/java/org/onap/aai/restclient/client/Headers.java
+++ b/src/main/java/org/onap/aai/restclient/client/Headers.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.client;
diff --git a/src/main/java/org/onap/aai/restclient/client/OperationResult.java b/src/main/java/org/onap/aai/restclient/client/OperationResult.java
index ad11863..09fa98e 100644
--- a/src/main/java/org/onap/aai/restclient/client/OperationResult.java
+++ b/src/main/java/org/onap/aai/restclient/client/OperationResult.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.client;
diff --git a/src/main/java/org/onap/aai/restclient/client/RestClient.java b/src/main/java/org/onap/aai/restclient/client/RestClient.java
index 9e74c95..64b52fb 100644
--- a/src/main/java/org/onap/aai/restclient/client/RestClient.java
+++ b/src/main/java/org/onap/aai/restclient/client/RestClient.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.client;
diff --git a/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java b/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java
index 6bff196..cdb2dde 100644
--- a/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java
+++ b/src/main/java/org/onap/aai/restclient/enums/RestAuthenticationMode.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.enums;
diff --git a/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java b/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java
index a2939bc..befd535 100644
--- a/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java
+++ b/src/main/java/org/onap/aai/restclient/logging/RestClientMsgs.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.logging;
diff --git a/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java b/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java
index 0677a16..fdb22d3 100644
--- a/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java
+++ b/src/main/java/org/onap/aai/restclient/rest/HttpUtil.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.rest;
diff --git a/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java
index 0272065..310a059 100644
--- a/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java
+++ b/src/main/java/org/onap/aai/restclient/rest/RestClientBuilder.java
@@ -2,8 +2,8 @@
* ============LICENSE_START=======================================================
* org.onap.aai
* ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * 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.
@@ -17,8 +17,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.aai.restclient.rest;