diff options
| author |   James Forsyth <jf2512@att.com> | 2018-03-22 12:16:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-22 12:16:39 +0000 |
| commit | b1264ad4012f67664d71982a0eaad7e9bcce34f4 (patch) | |
| tree | 037b5cd263fb905ee592f8b83c99f24cecb7eebe /aai-utils/src | |
| parent | b525e71480278b3314d0dde2e36ab494947cd0f7 (diff) | |
| parent | a9275b0c30881dac42f364ffca6f0d9cbff1b614 (diff) | |
Merge "Update the license for 2017-2018 license"
Diffstat (limited to 'aai-utils/src')
3 files changed, 6 insertions, 12 deletions
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; |