From 345aef728afe1c969bef11108ade881ab7704051 Mon Sep 17 00:00:00 2001 From: sblimkie Date: Tue, 13 Mar 2018 10:20:07 -0400 Subject: Update license date and text Update license date and disable license plugin Change-Id: I85a2f6676c5ef170c0bf7e0be742f52bacee46d7 Issue-ID: AAI-866 Signed-off-by: sblimkie --- License.txt | 6 ++-- common-logging/pom.xml | 38 +++++++++++----------- eelf-logging/pom.xml | 38 +++++++++++----------- .../org/onap/aai/cl/eelf/AaiLoggerAdapter.java | 6 ++-- .../java/org/onap/aai/cl/eelf/AuditLogLine.java | 6 ++-- .../java/org/onap/aai/cl/eelf/ErrorLogLine.java | 6 ++-- .../java/org/onap/aai/cl/eelf/LogMessageEnum.java | 6 ++-- .../java/org/onap/aai/cl/eelf/LoggerFactory.java | 6 ++-- .../java/org/onap/aai/cl/eelf/MetricsLogLine.java | 6 ++-- logging-api/License.txt | 20 ------------ logging-api/pom.xml | 38 +++++++++++----------- .../main/java/org/onap/aai/cl/api/LogFields.java | 6 ++-- .../src/main/java/org/onap/aai/cl/api/LogLine.java | 6 ++-- .../src/main/java/org/onap/aai/cl/api/Logger.java | 6 ++-- .../onap/aai/cl/api/LoggerFactoryInterface.java | 6 ++-- .../main/java/org/onap/aai/cl/mdc/MdcContext.java | 6 ++-- .../main/java/org/onap/aai/cl/mdc/MdcOverride.java | 6 ++-- pom.xml | 24 ++++++++++++++ 18 files changed, 107 insertions(+), 129 deletions(-) delete mode 100644 logging-api/License.txt 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/common-logging/pom.xml b/common-logging/pom.xml index af38e18..d2cbaf0 100644 --- a/common-logging/pom.xml +++ b/common-logging/pom.xml @@ -1,23 +1,23 @@ +============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========================================================= +--> 4.0.0 diff --git a/eelf-logging/pom.xml b/eelf-logging/pom.xml index 39c357f..cd5b4aa 100644 --- a/eelf-logging/pom.xml +++ b/eelf-logging/pom.xml @@ -1,23 +1,23 @@ +============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========================================================= +--> 4.0.0 diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AaiLoggerAdapter.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AaiLoggerAdapter.java index 88b2f11..25ab5ee 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AaiLoggerAdapter.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AaiLoggerAdapter.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.cl.eelf; diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AuditLogLine.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AuditLogLine.java index 1a5d23b..6c2e6dd 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AuditLogLine.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/AuditLogLine.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.cl.eelf; diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/ErrorLogLine.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/ErrorLogLine.java index a7bf4a7..b926d64 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/ErrorLogLine.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/ErrorLogLine.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.cl.eelf; diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LogMessageEnum.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LogMessageEnum.java index 79e17b9..6bfe41b 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LogMessageEnum.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LogMessageEnum.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.cl.eelf; diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LoggerFactory.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LoggerFactory.java index 26a8e4e..bd6b8d0 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LoggerFactory.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/LoggerFactory.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.cl.eelf; diff --git a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/MetricsLogLine.java b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/MetricsLogLine.java index 3b622d0..c235e79 100644 --- a/eelf-logging/src/main/java/org/onap/aai/cl/eelf/MetricsLogLine.java +++ b/eelf-logging/src/main/java/org/onap/aai/cl/eelf/MetricsLogLine.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.cl.eelf; diff --git a/logging-api/License.txt b/logging-api/License.txt deleted file mode 100644 index 09cff85..0000000 --- a/logging-api/License.txt +++ /dev/null @@ -1,20 +0,0 @@ -============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========================================================= - -ECOMP is a trademark and service mark of AT&T Intellectual Property. \ No newline at end of file diff --git a/logging-api/pom.xml b/logging-api/pom.xml index cd7faeb..5a33f80 100644 --- a/logging-api/pom.xml +++ b/logging-api/pom.xml @@ -1,23 +1,23 @@ +============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========================================================= +--> 4.0.0 diff --git a/logging-api/src/main/java/org/onap/aai/cl/api/LogFields.java b/logging-api/src/main/java/org/onap/aai/cl/api/LogFields.java index 80a4507..99786ea 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/api/LogFields.java +++ b/logging-api/src/main/java/org/onap/aai/cl/api/LogFields.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.cl.api; diff --git a/logging-api/src/main/java/org/onap/aai/cl/api/LogLine.java b/logging-api/src/main/java/org/onap/aai/cl/api/LogLine.java index eb6dcc8..3b18f91 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/api/LogLine.java +++ b/logging-api/src/main/java/org/onap/aai/cl/api/LogLine.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.cl.api; diff --git a/logging-api/src/main/java/org/onap/aai/cl/api/Logger.java b/logging-api/src/main/java/org/onap/aai/cl/api/Logger.java index df38692..ae1018f 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/api/Logger.java +++ b/logging-api/src/main/java/org/onap/aai/cl/api/Logger.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.cl.api; diff --git a/logging-api/src/main/java/org/onap/aai/cl/api/LoggerFactoryInterface.java b/logging-api/src/main/java/org/onap/aai/cl/api/LoggerFactoryInterface.java index 4fcf642..33c272d 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/api/LoggerFactoryInterface.java +++ b/logging-api/src/main/java/org/onap/aai/cl/api/LoggerFactoryInterface.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.cl.api; diff --git a/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcContext.java b/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcContext.java index 11cacd9..e69b66a 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcContext.java +++ b/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcContext.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.cl.mdc; diff --git a/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcOverride.java b/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcOverride.java index 1456217..9bcee2e 100644 --- a/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcOverride.java +++ b/logging-api/src/main/java/org/onap/aai/cl/mdc/MdcOverride.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.cl.mdc; diff --git a/pom.xml b/pom.xml index 42ce0a3..664a986 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,24 @@ + + 4.0.0 @@ -68,6 +89,7 @@ + + org.sonatype.plugins nexus-staging-maven-plugin -- cgit 1.2.3-korg