From f1dfbaa059817fc0d4cf3414cfd1a9b74d760d94 Mon Sep 17 00:00:00 2001 From: Glen Johnson Date: Thu, 21 Sep 2023 11:48:57 -0600 Subject: [PATCH] Update notices.txt and API_VERSION --- API_VERSION | 2 +- CHANGELOG.md | 5 +++-- NOTICES.txt | 25 +++++++++++++++++++++---- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/API_VERSION b/API_VERSION index 03f488b076..c7cb1311a6 100644 --- a/API_VERSION +++ b/API_VERSION @@ -1 +1 @@ -5.3.0 +5.3.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 789e38031d..fb813ae080 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Nothing should go in this section, please add to the latest unreleased version (and update the corresponding date), or add a new version. -## [1.20.0] - 2023-08-16 +## [1.20.0] - 2023-09-21 ### Fixed - Allow Factories with optional variables to save without error @@ -1093,7 +1093,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/conjur/compare/v1.19.5...HEAD +[Unreleased]: https://github.com/cyberark/conjur/compare/v1.20.0...HEAD +[1.20.0]: https://github.com/cyberark/conjur/compare/v1.19.5...v1.20.0 [1.19.5]: https://github.com/cyberark/conjur/compare/v1.19.3...v1.19.5 [1.19.3]: https://github.com/cyberark/conjur/compare/v1.19.2...v1.19.3 [1.19.2]: https://github.com/cyberark/conjur/compare/v1.19.1...v1.19.2 diff --git a/NOTICES.txt b/NOTICES.txt index 9e2a0db3ec..bf9aa0f610 100644 --- a/NOTICES.txt +++ b/NOTICES.txt @@ -10,6 +10,7 @@ Section 1: Apache-2.0 >>> https://rubygems.org/gems/aws-sdk-iam/versions/1.81.0 >>> https://rubygems.org/gems/gli/versions/2.21.0 +>>> https://rubygems.org/gems/prometheus-client/versions/3.0.0 Section 2: BSD-2-Clause @@ -20,7 +21,7 @@ Section 3: BSD-3-Clause >>> https://rubygems.org/gems/base32-crockford/versions/0.1.0 >>> https://rubygems.org/gems/ffi/versions/1.15.5 ->>> https://rubygems.org/gems/puma/versions/6.3.0 +>>> https://rubygems.org/gems/puma/versions/6.3.1 Section 4: MIT @@ -43,7 +44,7 @@ Section 4: MIT >>> https://rubygems.org/gems/loofah/versions/2.21.3 >>> https://rubygems.org/gems/net-ldap/versions/0.18.0 >>> https://rubygems.org/gems/nokogiri/versions/1.15.3-x86_64-darwin ->>> https://rubygems.org/gems/openid_connect/versions/1.3.0 +>>> https://rubygems.org/gems/openid_connect/versions/2.2.0 >>> https://rubygems.org/gems/rack-rewrite/versions/1.5.1 >>> https://rubygems.org/gems/rails/versions/6.1.7.4 >>> https://rubygems.org/gems/rake/versions/13.0.6 @@ -98,6 +99,22 @@ 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. +>> https://rubygems.org/gems/prometheus-client/versions/3.0.0 + +Copyright [yyyy] [name of copyright owner] + +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. + --------------- SECTION 2: BSD-2-Clause ---------- BSD-2-Clause License is applicable to the following component(s). @@ -214,7 +231,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ->>> https://rubygems.org/gems/puma/versions/6.3.0 +>>> https://rubygems.org/gems/puma/versions/6.3.1 Some code copyright (c) 2005, Zed Shaw Copyright (c) 2011, Evan Phoenix @@ -680,7 +697,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. ->>> https://rubygems.org/gems/openid_connect/versions/1.3.0 +>>> https://rubygems.org/gems/openid_connect/versions/2.2.0 Copyright (c) 2011 nov matake