Skip to content

bump jetty client to 11 0 14 #78

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

Merged
merged 2 commits into from
May 16, 2023
Merged

Conversation

derek-ho
Copy link
Collaborator

Description

[Describe what this change achieves]

Issues Resolved

[List any issues this PR will resolve]

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@@ -239,6 +239,9 @@ jacocoTestCoverageVerification {
configurations.all {
// fixes https://www.mend.io/vulnerability-database/CVE-2023-24998
resolutionStrategy.force 'commons-fileupload:commons-fileupload:1.5'
resolutionStrategy.force 'org.eclipse.jetty:jetty-client:11.0.14'
Copy link
Collaborator

Choose a reason for hiding this comment

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

qq, jetty-server:11:0.14 conflict with which version?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Wiremock is bringing in several dependencies under version 11.0.12, which are vulnerable:

+--- com.github.tomakehurst:wiremock:3.0.0-beta-2
|    +--- org.eclipse.jetty:jetty-server:11.0.12 -> 11.0.14
|    |    +--- org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2
|    |    +--- org.eclipse.jetty:jetty-http:11.0.14
|    |    |    +--- org.eclipse.jetty:jetty-util:11.0.14
|    |    |    |    \--- org.slf4j:slf4j-api:2.0.5
|    |    |    +--- org.eclipse.jetty:jetty-io:11.0.14
|    |    |    |    +--- org.slf4j:slf4j-api:2.0.5
|    |    |    |    \--- org.eclipse.jetty:jetty-util:11.0.14 (*)
|    |    |    \--- org.slf4j:slf4j-api:2.0.5
|    |    +--- org.eclipse.jetty:jetty-io:11.0.14 (*)
|    |    \--- org.slf4j:slf4j-api:2.0.5
|    +--- org.eclipse.jetty:jetty-servlet:11.0.12
|    |    +--- org.eclipse.jetty:jetty-security:11.0.12
|    |    |    +--- org.eclipse.jetty:jetty-server:11.0.12 -> 11.0.14 (*)
|    |    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty:jetty-servlets:11.0.12
|    |    +--- org.eclipse.jetty:jetty-http:11.0.12 -> 11.0.14 (*)
|    |    +--- org.eclipse.jetty:jetty-util:11.0.12 -> 11.0.14 (*)
|    |    +--- org.eclipse.jetty:jetty-io:11.0.12 -> 11.0.14 (*)
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty:jetty-webapp:11.0.12
|    |    +--- org.eclipse.jetty:jetty-servlet:11.0.12 (*)
|    |    +--- org.eclipse.jetty:jetty-xml:11.0.12
|    |    |    +--- org.eclipse.jetty:jetty-util:11.0.12 -> 11.0.14 (*)
|    |    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty:jetty-proxy:11.0.12
|    |    +--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |    +--- org.eclipse.jetty:jetty-util:11.0.12 -> 11.0.14 (*)
|    |    \--- org.eclipse.jetty:jetty-client:11.0.12
|    |         +--- org.eclipse.jetty:jetty-http:11.0.12 -> 11.0.14 (*)
|    |         +--- org.eclipse.jetty:jetty-io:11.0.12 -> 11.0.14 (*)
|    |         +--- org.eclipse.jetty:jetty-alpn-client:11.0.12
|    |         |    +--- org.eclipse.jetty:jetty-io:11.0.12 -> 11.0.14 (*)
|    |         |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |         \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty.http2:http2-server:11.0.12
|    |    +--- org.eclipse.jetty.http2:http2-common:11.0.12
|    |    |    +--- org.eclipse.jetty.http2:http2-hpack:11.0.12
|    |    |    |    +--- org.eclipse.jetty:jetty-util:11.0.12 -> 11.0.14 (*)
|    |    |    |    +--- org.eclipse.jetty:jetty-http:11.0.12 -> 11.0.14 (*)
|    |    |    |    +--- org.eclipse.jetty:jetty-io:11.0.12 -> 11.0.14 (*)
|    |    |    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    |    +--- org.eclipse.jetty:jetty-server:11.0.12 -> 11.0.14 (*)
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty:jetty-alpn-server:11.0.12
|    |    +--- org.eclipse.jetty:jetty-server:11.0.12 -> 11.0.14 (*)
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5
|    +--- org.eclipse.jetty:jetty-alpn-java-server:11.0.12
|    |    +--- org.eclipse.jetty:jetty-io:11.0.12 -> 11.0.14 (*)
|    |    +--- org.eclipse.jetty:jetty-alpn-server:11.0.12 (*)
|    |    \--- org.slf4j:slf4j-api:2.0.0 -> 2.0.5

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

11.0.12

@derek-ho derek-ho merged commit 5e8d914 into opensearch-project:main May 16, 2023
@derek-ho derek-ho deleted the cve branch May 16, 2023 18:34
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.

3 participants