Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch '7.x' #2766

Merged

Conversation

jonathannewman
Copy link
Contributor

  • 7.x:
    (maint) update submodule versions and agent pin
    (PE-36184) Update ezbake to 2.5.0 in prep for logback 1.3.x bump
    (maint) update submodule versions and agent pin
    (PE-36479) remove use of clj-yaml

jonathannewman and others added 7 commits July 18, 2023 09:57
This removes the use of clj-yaml, and replaces it with a use of
snake-yaml as implemented in trapperkeeper. This is to help
resolve https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-1471

which can't be fully resolved due to a dependency on snakeyaml 1.3.3 by jRuby
…emove-clj-yaml

(PE-36479) remove use of clj-yaml
…zbake-to-2.5.0-for-logback

(PE-36184) Update ezbake to 2.5.0 in prep for logback 1.3.x bump
* 7.x:
  (maint) update submodule versions and agent pin
  (PE-36184) Update ezbake to 2.5.0 in prep for logback 1.3.x bump
  (maint) update submodule versions and agent pin
  (PE-36479) remove use of clj-yaml
@jonathannewman jonathannewman requested a review from a team as a code owner July 21, 2023 17:34
Copy link
Contributor

@steveax steveax left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@jonathannewman jonathannewman merged commit c4f0e0b into puppetlabs:main Jul 21, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants