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

bump snakeyaml to 1.33 in logstash-core #14881

Merged
merged 1 commit into from Feb 9, 2023
Merged

Conversation

jsvd
Copy link
Member

@jsvd jsvd commented Feb 9, 2023

ensure logstash-core picks up 1.33 as well from jackson-dataformat-yaml's transititive dependency

Since the current version of jackson-dataformat-yaml has its own dependency of snakeyaml 1.30, logstash-core will have 1.30 instead of 1.33 unless it's overriden in logstash-core/build.gradle's dependency section

ensure logstash-core picks up 1.33 as well from jackson-databind-yaml's
transititive dependency.
@jsvd jsvd changed the title bump snakeyaml to 1.33 bump snakeyaml to 1.33 in logstash-core Feb 9, 2023
Copy link
Contributor

@kaisecheng kaisecheng left a comment

Choose a reason for hiding this comment

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

LGTM

@jsvd
Copy link
Member Author

jsvd commented Feb 9, 2023

for reference:

~/elastic/logstash ❯ git co v8.6.1
Note: switching to 'v8.6.1'.
HEAD is now at 6a248b509 Update snakeyaml to 1.33 (#14848)

~/elastic/logstash tags/v8.6.1* ❯ ./gradlew clean assemble
BUILD SUCCESSFUL in 18s
46 actionable tasks: 42 executed, 4 up-to-date

~/elastic/logstash tags/v8.6.1* ❯ find . -name "*snakeyaml*jar"
./logstash-core/lib/jars/snakeyaml-1.30.jar
./vendor/jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.31/snakeyaml-1.31.jar

~/elastic/logstash tags/v8.6.1 ❯ git co -                              
Previous HEAD position was 6a248b509 Update snakeyaml to 1.33 (#14848)
Switched to branch 'bump_snakeyaml_1_33'

~/elastic/logstash bump_snakeyaml_1_33* ❯ ./gradlew clean assemble     

BUILD SUCCESSFUL in 13s
46 actionable tasks: 42 executed, 4 up-to-date

~/elastic/logstash bump_snakeyaml_1_33* ❯ find . -name "*snakeyaml*jar"
./logstash-core/lib/jars/snakeyaml-1.33.jar
./vendor/jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.33/snakeyaml-1.33.jar

@jsvd jsvd merged commit 15b2d88 into elastic:main Feb 9, 2023
@jsvd
Copy link
Member Author

jsvd commented Feb 9, 2023

@logstashmachine backport 8.7

@jsvd
Copy link
Member Author

jsvd commented Feb 9, 2023

@logstashmachine backport 8.6

github-actions bot pushed a commit that referenced this pull request Feb 9, 2023
ensure logstash-core picks up 1.33 as well from jackson-data format-yaml's
transititive dependency.

(cherry picked from commit 15b2d88)
@github-actions github-actions bot added the v8.7.0 label Feb 9, 2023
github-actions bot pushed a commit that referenced this pull request Feb 9, 2023
ensure logstash-core picks up 1.33 as well from jackson-data format-yaml's
transititive dependency.

(cherry picked from commit 15b2d88)
@github-actions github-actions bot added the v8.6.3 label Feb 9, 2023
@jsvd jsvd deleted the bump_snakeyaml_1_33 branch February 9, 2023 18:50
jsvd added a commit that referenced this pull request Feb 9, 2023
ensure logstash-core picks up 1.33 as well from jackson-dataformat-yaml's
transititive dependency.

(cherry picked from commit 15b2d88)

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
jsvd added a commit that referenced this pull request Feb 9, 2023
ensure logstash-core picks up 1.33 as well from jackson-dataformat-yaml's
transititive dependency.

(cherry picked from commit 15b2d88)

Co-authored-by: João Duarte <jsvd@users.noreply.github.com>
@jsvd jsvd added v8.6.2 and removed v8.6.3 labels Feb 9, 2023
@elastic elastic deleted a comment from mashhurs Mar 13, 2023
@elastic elastic deleted a comment from mashhurs Mar 13, 2023
@kaisecheng
Copy link
Contributor

@logstashmachine backport 7.17

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants