From 56c71af92550a3e1b80f90e97c251347119e1a00 Mon Sep 17 00:00:00 2001 From: Glen Johnson Date: Thu, 2 Mar 2023 13:49:56 -0700 Subject: [PATCH] Bump version to 2.2.7 --- .codeclimate.yml | 1 + CHANGELOG.md | 9 +++++++-- NOTICES.txt | 12 ++++++------ VERSION | 2 +- ci/utils | 3 --- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 97f7a03..3c67fd1 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -16,6 +16,7 @@ plugins: go: java: javascript: + php: python: python_version: 3 # ACTION Comment this out if using Python 2 ruby: diff --git a/CHANGELOG.md b/CHANGELOG.md index 40c80ca..ca1cdab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,9 +5,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] + +## [2.2.7] - 2023-03-02 ### Security +- Upgdate spring-boot and Golang dependencies. Upgrade test app to Ruby 3 and update ruby dependencies. + [cyberark/cloudfoundry-conjur-buildpack#164](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/164) - Upgrade sinatra to 2.2.3 in /tests/integration/apps/ruby to resolve CVE-2022-45442 - [cyberark/cloudfoundry-conjur-buildpack](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/159) + [cyberark/cloudfoundry-conjur-buildpack#159](https://github.com/cyberark/cloudfoundry-conjur-buildpack/pull/159) ## [2.2.6] - 2022-11-23 ### Changed @@ -197,7 +201,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ### Added - The first tagged version. -[Unreleased]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.6...HEAD +[Unreleased]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.7...HEAD +[2.2.7]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.6...v2.2.7 [2.2.6]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.5...v2.2.6 [2.2.5]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.4...v2.2.5 [2.2.4]: https://github.com/cyberark/cloudfoundry-conjur-buildpack/compare/v2.2.3...v2.2.4 diff --git a/NOTICES.txt b/NOTICES.txt index db5504b..148b8d7 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -10,14 +10,14 @@ of the license associated with each component. SECTION 1: Apache License 2.0 ->>> github.com/cyberark/conjur-api-go-0.10.1 +>>> github.com/cyberark/conjur-api-go-0.11.0 >>> gopkg.in/yaml.v2-2.4.0 >>> gopkg.in/yaml.v3-3.0.1 SECTION 2: BSD 3-clause "New" or "Revised" License >>> github.com/pmezard/go-difflib-1.0.0 ->>> golang.org/x/sys-0.0.0-20220728004956-3c1f35247d10 +>>> golang.org/x/sys-0.3.0 SECTION 3: MIT License @@ -26,7 +26,7 @@ SECTION 3: MIT License >>> github.com/sirupsen/logrus-1.8.1 >>> github.com/stretchr/testify v1.8.0 >>> gopkg.in/yaml.v2-2.4.0 ->>> gopkg.in/yaml.v3-3.0.1-20210107192922-496545a6307b +>>> gopkg.in/yaml.v3-3.0.1 SECTION 4: ISC License @@ -47,7 +47,7 @@ APPENDIX: Standard License Files and Templates Apache License 2.0 is applicable to the following component(s). ->>> github.com/cyberark/conjur-api-go-0.10.1 +>>> github.com/cyberark/conjur-api-go-0.11.0 Copyright 2020 CyberArk Software Ltd. @@ -110,7 +110,7 @@ limitations under the License. BSD 3-clause "New" or "Revised" License is applicable to the following component(s). ->>> golang.org/x/sys-0.0.0-20220728004956-3c1f35247d10 +>>> golang.org/x/sys-0.3.0 Copyright (c) 2009 The Go Authors. All rights reserved. @@ -300,7 +300,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ->>> gopkg.in/yaml.v3-3.0.1-20210107192922-496545a6307b +>>> gopkg.in/yaml.v3-3.0.1 #### MIT License #### diff --git a/VERSION b/VERSION index bda8fbe..5bc1cc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.6 +2.2.7 diff --git a/ci/utils b/ci/utils index ac20335..45dba29 100755 --- a/ci/utils +++ b/ci/utils @@ -12,9 +12,6 @@ function announce { } function finish { - announce 'Dumping Conjur logs...' - docker-compose -f "$DOCKER_COMPOSE_FILE" logs --tail="all" conjur - announce 'Removing environment...' docker-compose -f "$DOCKER_COMPOSE_FILE" down -v }