From 10bba35de2cc3b2c33cb2a1f04cae45bbdcd0c4e Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 19 Jul 2017 12:09:28 -0700 Subject: Applying license changes to all files [APPC-87] Fix Maven License Plugin Change-Id: I23a95b6c1020618d05f17c63c72152cf86e4d4a0 Signed-off-by: Patrick Brady --- .../openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java | 8 +++++--- .../java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java | 8 +++++--- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 8 +++++--- .../src/main/resources/org/openecomp/appc/default.properties | 8 +++++--- .../java/org/openecomp/appc/licmgr/LicenseManagerImplTest.java | 8 +++++--- .../test/java/org/openecomp/appc/licmgr/LicenseManagerMock.java | 8 +++++--- .../org/openecomp/appc/licmgr/LicenseManagerPluginImplTest.java | 8 +++++--- .../test/java/org/openecomp/appc/licmgr/LicenseServiceMock.java | 8 +++++--- .../java/org/openecomp/appc/licmgr/TestVfLicenseModelConvert.java | 8 +++++--- 9 files changed, 45 insertions(+), 27 deletions(-) (limited to 'appc-dispatcher/appc-license-manager/appc-license-manager-core/src') diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java index b29b904ce..ef252cca6 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseDataAccessServiceImpl.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * Copyright (C) 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 @@ -16,8 +17,9 @@ * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.licmgr.impl; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java index 74ea8e987..0d7da6766 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/java/org/openecomp/appc/licmgr/impl/LicenseManagerImpl.java @@ -1,10 +1,11 @@ /*- * ============LICENSE_START======================================================= - * APPC + * ONAP : APPC * ================================================================================ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * Copyright (C) 2017 Amdocs * ================================================================================ + * Copyright (C) 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 @@ -16,8 +17,9 @@ * 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. + * ============LICENSE_END========================================================= */ package org.openecomp.appc.licmgr.impl; diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index fc535a501..bb11262db 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -1,11 +1,12 @@