From 15b93e7ad7db7372d51c4c1ad45f95d463aaaffc Mon Sep 17 00:00:00 2001 From: lukegleeson Date: Wed, 7 Jul 2021 15:25:30 +0100 Subject: Editing of Nordix Licenses to ONAP guidelines Issue-ID: CPS-489 Signed-off-by: lukegleeson Change-Id: I415534515b3d8325f41d5dc1d02c6e0ae70c6cf1 --- cps-application/pom.xml | 4 ++-- cps-application/src/main/java/org/onap/cps/Application.java | 6 +++--- cps-application/src/main/resources/application.yml | 6 ++++-- 3 files changed, 9 insertions(+), 7 deletions(-) (limited to 'cps-application') diff --git a/cps-application/pom.xml b/cps-application/pom.xml index f656215c06..1ea5d330d0 100755 --- a/cps-application/pom.xml +++ b/cps-application/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= Copyright (c) 2021 Pantheon.tech. Modifications Copyright (C) 2021 Bell Canada. - Modification Copyright (C) 2021 Nordix Foundation + Modifications Copyright (C) 2021 Nordix Foundation ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -254,4 +254,4 @@ - \ No newline at end of file + diff --git a/cps-application/src/main/java/org/onap/cps/Application.java b/cps-application/src/main/java/org/onap/cps/Application.java index d8e849d53d..ba707e964b 100644 --- a/cps-application/src/main/java/org/onap/cps/Application.java +++ b/cps-application/src/main/java/org/onap/cps/Application.java @@ -1,6 +1,6 @@ -/*- +/* * ============LICENSE_START======================================================= - * Copyright (C) 2020 Nordix Foundation. All rights reserved. + * Copyright (C) 2020 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,4 +29,4 @@ public class Application { public static void main(final String[] args) { SpringApplication.run(Application.class, args); } -} \ No newline at end of file +} diff --git a/cps-application/src/main/resources/application.yml b/cps-application/src/main/resources/application.yml index 4f3072eb91..5ae6786ef1 100644 --- a/cps-application/src/main/resources/application.yml +++ b/cps-application/src/main/resources/application.yml @@ -1,12 +1,14 @@ # ============LICENSE_START======================================================= -# Modification (C) 2021 Nordix Foundation -# Modification Copyright (C) 2021 Bell Canada. +# Copyright (C) 2021 Pantheon.tech +# Modifications Copyright (C) 2021 Bell Canada +# Modifications Copyright (C) 2021 Nordix Foundation # ================================================================================ # 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. -- cgit 1.2.3-korg