From 475a64860f8909a59206308a666b5a4e078dedf3 Mon Sep 17 00:00:00 2001
From: "Hansen, Tony (th1395)" <th1395@att.com>
Date: Mon, 19 Jul 2021 23:45:06 +0000
Subject: use version 2.2.1 of pypi onap_dcae_cbs_docker_client

Change-Id: I09106b2595deb4b8c74e4adad54ae3b78f896071
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
Issue-ID: DCAEGEN2-2853
Signed-off-by: Hansen, Tony (th1395) <th1395@att.com>
---
 Changelog.md       | 8 +++++++-
 pom.xml            | 4 ++--
 requirements.txt   | 1 +
 setup.py           | 7 ++++---
 tox.ini            | 4 ++--
 version.properties | 2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index adda18d..c4a3f50 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,4 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
-## [2.0.3] - 15/12/2020      
\ No newline at end of file
+## [2.0.5] - 2021/07/19
+* Changed to use version 2.2.1 of pypi onap_dcae_cbs_docker_client
+
+## [2.0.4] - 2021/02/12
+pysnmp version upgraded to 4.4.12 for python >3.7 compatibility
+
+## [2.0.3] - 2020/12/15
diff --git a/pom.xml b/pom.xml
index 80c9eee..3525b11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!--
 ================================================================================
-Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2017-2021 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.
@@ -30,7 +30,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.collectors</groupId>
   <artifactId>snmptrap</artifactId>
   <name>dcaegen2-collectors-snmptrap</name>
-  <version>2.0.3-SNAPSHOT</version>
+  <version>2.0.5-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/requirements.txt b/requirements.txt
index d9e0b1a..52b5bc1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,3 +3,4 @@ requests==2.18.3
 onap_dcae_cbs_docker_client==2.1.0
 asyncio
 pathlib
+pyyaml
diff --git a/setup.py b/setup.py
index aab406b..be7f673 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 # org.onap.dcae
 # ================================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2021 AT&T Intellectual Property. All rights reserved.
 # Copyright 2021 Deutsche Telekom. All rights reserved.
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,12 +28,13 @@ from setuptools import setup, find_packages
 setup(
     name = "snmptrap",
     description = "snmp trap receiver for ONAP docker image",
-    version = "2.0.4",
+    version = "2.0.5",
     packages=find_packages(),
     install_requires=[
         "pysnmp==4.4.12",
         "requests==2.18.3",
-        "onap_dcae_cbs_docker_client==2.1.0"
+        "onap_dcae_cbs_docker_client==2.2.1",
+	"pyyaml"
     ],
     author = "Dave L",
     author_email = "dl3158@att.com",
diff --git a/tox.ini b/tox.ini
index 3e356ea..a91a3e3 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py36
-# envlist = py36,py37,py38,py39
+# envlist = py36
+envlist = py36,py37,py38,py39
 skip_missing_interpreters = true
 
 [testenv]
diff --git a/version.properties b/version.properties
index 45de691..5168625 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2
 minor=0
-patch=4
+patch=5
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg