From dfd79f0cb9f8d418871b5fb7f3616554c3261800 Mon Sep 17 00:00:00 2001 From: Alex Shatov Date: Tue, 27 Feb 2018 14:34:22 -0500 Subject: up the version to 2.1.0 for policy-handler - removed #org.onap.dcae from license text Change-Id: I07f11e60c4677109ccb826c4e969b47acb4c498a Signed-off-by: Alex Shatov Issue-ID: DCAEGEN2-347 --- etc/common_logger.config | 3 +-- etc_upload/upload_config_for_ph_in_docker.sh | 3 +-- policyhandler/__init__.py | 3 +-- policyhandler/config.py | 1 - policyhandler/deploy_handler.py | 1 - policyhandler/discovery.py | 1 - policyhandler/onap/CommonLogger.py | 3 +-- policyhandler/onap/__init__.py | 3 +-- policyhandler/onap/audit.py | 1 - policyhandler/onap/health.py | 1 - policyhandler/policy_consts.py | 1 - policyhandler/policy_handler.py | 1 - policyhandler/policy_receiver.py | 1 - policyhandler/policy_rest.py | 1 - policyhandler/policy_updater.py | 1 - policyhandler/policy_utils.py | 1 - policyhandler/web_server.py | 1 - pom.xml | 3 +-- run_policy.sh | 2 -- setup.py | 5 ++--- tests/test_policyhandler.py | 2 -- version.properties | 2 +- 22 files changed, 9 insertions(+), 32 deletions(-) diff --git a/etc/common_logger.config b/etc/common_logger.config index 84eaef6..fb625bb 100644 --- a/etc/common_logger.config +++ b/etc/common_logger.config @@ -1,6 +1,5 @@ -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/etc_upload/upload_config_for_ph_in_docker.sh b/etc_upload/upload_config_for_ph_in_docker.sh index 6cc3317..0854d21 100644 --- a/etc_upload/upload_config_for_ph_in_docker.sh +++ b/etc_upload/upload_config_for_ph_in_docker.sh @@ -1,8 +1,7 @@ #!/bin/bash -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/policyhandler/__init__.py b/policyhandler/__init__.py index a3220c4..e9d0246 100644 --- a/policyhandler/__init__.py +++ b/policyhandler/__init__.py @@ -1,6 +1,5 @@ -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/policyhandler/config.py b/policyhandler/config.py index aa99f18..d7768fa 100644 --- a/policyhandler/config.py +++ b/policyhandler/config.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/deploy_handler.py b/policyhandler/deploy_handler.py index c839e5c..5792631 100644 --- a/policyhandler/deploy_handler.py +++ b/policyhandler/deploy_handler.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/discovery.py b/policyhandler/discovery.py index d7c6bfb..a7e3c56 100644 --- a/policyhandler/discovery.py +++ b/policyhandler/discovery.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/onap/CommonLogger.py b/policyhandler/onap/CommonLogger.py index 15ab532..957b3aa 100644 --- a/policyhandler/onap/CommonLogger.py +++ b/policyhandler/onap/CommonLogger.py @@ -1,9 +1,8 @@ #!/usr/bin/python # -*- indent-tabs-mode: nil -*- vi: set expandtab: -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/policyhandler/onap/__init__.py b/policyhandler/onap/__init__.py index a3220c4..e9d0246 100644 --- a/policyhandler/onap/__init__.py +++ b/policyhandler/onap/__init__.py @@ -1,6 +1,5 @@ -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/policyhandler/onap/audit.py b/policyhandler/onap/audit.py index 8ffd770..4e8378c 100644 --- a/policyhandler/onap/audit.py +++ b/policyhandler/onap/audit.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/onap/health.py b/policyhandler/onap/health.py index 3cb3e8f..485f422 100644 --- a/policyhandler/onap/health.py +++ b/policyhandler/onap/health.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_consts.py b/policyhandler/policy_consts.py index 5c47414..013ed2a 100644 --- a/policyhandler/policy_consts.py +++ b/policyhandler/policy_consts.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_handler.py b/policyhandler/policy_handler.py index 4f8b784..8d5f360 100644 --- a/policyhandler/policy_handler.py +++ b/policyhandler/policy_handler.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_receiver.py b/policyhandler/policy_receiver.py index d00cf6d..843dbd8 100644 --- a/policyhandler/policy_receiver.py +++ b/policyhandler/policy_receiver.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_rest.py b/policyhandler/policy_rest.py index f689f7c..b11a79a 100644 --- a/policyhandler/policy_rest.py +++ b/policyhandler/policy_rest.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_updater.py b/policyhandler/policy_updater.py index 4eb3151..01be550 100644 --- a/policyhandler/policy_updater.py +++ b/policyhandler/policy_updater.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/policy_utils.py b/policyhandler/policy_utils.py index edcfdc6..652f98b 100644 --- a/policyhandler/policy_utils.py +++ b/policyhandler/policy_utils.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/policyhandler/web_server.py b/policyhandler/web_server.py index d2f77c4..8efb51d 100644 --- a/policyhandler/web_server.py +++ b/policyhandler/web_server.py @@ -1,4 +1,3 @@ -# org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ diff --git a/pom.xml b/pom.xml index ab82f1b..30f7721 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property. org.onap.dcaegen2.platform policy-handler dcaegen2-platform-policy-handler - - 2.0.1-SNAPSHOT + 2.1.0-SNAPSHOT http://maven.apache.org UTF-8 diff --git a/run_policy.sh b/run_policy.sh index 6f28bc3..a95aee9 100644 --- a/run_policy.sh +++ b/run_policy.sh @@ -1,8 +1,6 @@ #!/bin/bash # ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/setup.py b/setup.py index ccb9c59..cb2ac8e 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,5 @@ -# org.onap.dcae # ================================================================================ -# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -24,7 +23,7 @@ from setuptools import setup setup( name='policyhandler', description='DCAE-Controller policy-handler to communicate with policy-engine', - version="2.0.0", + version="2.1.0", author='Alex Shatov', packages=['policyhandler'], zip_safe=False, diff --git a/tests/test_policyhandler.py b/tests/test_policyhandler.py index bd5ca19..f47d9d0 100644 --- a/tests/test_policyhandler.py +++ b/tests/test_policyhandler.py @@ -1,6 +1,4 @@ # ============LICENSE_START======================================================= -# org.onap.dcae -# ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/version.properties b/version.properties index fbd1b27..91dd40e 100644 --- a/version.properties +++ b/version.properties @@ -1,5 +1,5 @@ major=2 -minor=0 +minor=1 patch=0 base_version=${major}.${minor}.${patch} release_version=${base_version} -- cgit 1.2.3-korg