Skip to content

Commit

Permalink
Merge pull request #2957 from cyberark/release-1.20.0
Browse files Browse the repository at this point in the history
Update notices.txt and API_VERSION
  • Loading branch information
gl-johnson authored Sep 21, 2023
2 parents 7d7691c + f1dfbaa commit 0d04644
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion API_VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.3.0
5.3.1
5 changes: 3 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
25 changes: 21 additions & 4 deletions NOTICES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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
Expand Down Expand Up @@ -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).
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 0d04644

Please sign in to comment.