chore(manifest): fix merge conflicts, update version to 0.5.0

Signed-off-by: Frederico Araujo <[email protected]>

Author: araujof

CHANGELOG.md

@@ -15,13 +15,29 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
-## [0.5.0] - 2022-07-31
+## [0.5.0] - 2022-10-17
 
 ### Added
 
 - Add k8s pod and event object support to sysflow spec and APIs
 - Add enumeration of sysflow types in C++ API.
 
+### Changed
+
+- Bump UBI to 8.6-941
+
+## [0.4.4] - 2022-08-01
+
+### Changed
+
+- Bump UBI to 8.6-855
+
+## [0.4.3] - 2022-08-01
+
+### Changed
+
+- Bumped SysFlow version to 0.4.4
+
 ## [0.4.3] - 2022-06-21
 
 ### Changed
@@ -180,8 +196,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
 - First release candidate with basic set of SysFlow APIs (C++ and Python).
 
-[Unreleased]: https://github.com/sysflow-telemetry/sf-apis/compare/0.5.0-rc1...HEAD
-[0.5.0]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.3...0.5.0-rc1
+[Unreleased]: https://github.com/sysflow-telemetry/sf-apis/compare/0.5.0...HEAD
+[0.5.0]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.4...0.5.0
+[0.4.4]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.3...0.4.4
 [0.4.3]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.2...0.4.3
 [0.4.2]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.1...0.4.2
 [0.4.1]: https://github.com/sysflow-telemetry/sf-apis/compare/0.4.0...0.4.1

Dockerfile.sysprint

@@ -16,7 +16,7 @@
 # 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.
-ARG UBI_VER=8.6-751
+ARG UBI_VER=8.6-941
 FROM registry.access.redhat.com/ubi8/ubi-minimal:${UBI_VER}
 
 # Build args

LICENSE.md

@@ -1,4 +1,4 @@
-```
+
                                  Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
@@ -175,4 +175,28 @@
       of your accepting any such warranty or additional liability.
 
    END OF TERMS AND CONDITIONS
-```
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2019 The Falco Authors
+
+   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.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -6,7 +6,7 @@
 
 # Supported tags and respective `Dockerfile` links
 
--	[`0.4.3`, `latest`](https://github.com/sysflow-telemetry/sf-apis/blob/0.4.3/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-apis/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-apis/blob/dev/Dockerfile)
+-	[`0.5.0`, `latest`](https://github.com/sysflow-telemetry/sf-apis/blob/0.5.0/Dockerfile), [`edge`](https://github.com/sysflow-telemetry/sf-apis/blob/master/Dockerfile), [`dev`](https://github.com/sysflow-telemetry/sf-apis/blob/dev/Dockerfile)
 
 # Quick reference
 

py3/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = sysflow-tools
-version = 0.5.0-rc1
+version = 0.5.0
 description = SysFlow APIs and utilities
 long_description = file:README.md
 long_description_content_type = text/markdown