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

Update wiremock and jetty #46

Merged
merged 3 commits into from
Jan 5, 2023

Conversation

Yury-Fridlyand
Copy link
Collaborator

Signed-off-by: Yury-Fridlyand [email protected]

Description

Update wiremock and jetty which wiremock depends on.
Wiremock release: https://github.com/wiremock/wiremock/releases/tag/3.0.0-beta-2
Maven: https://mvnrepository.com/artifact/com.github.tomakehurst/wiremock/3.0.0-beta-2
Previous update: opensearch-project/sql#872
Newer jetty activates SNI check, so I had to disable it, ref: https://github.com/Bit-Quill/sql-jdbc/blob/c3a79b79d58665d8fd3b69167c9a8fa9601a0467/src/test/java/org/opensearch/jdbc/test/TLSServer.java#L88-L90

Issues Resolved

Closes #7 and #8

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.

@Yury-Fridlyand Yury-Fridlyand requested a review from a team as a code owner January 5, 2023 18:23
@YANG-DB YANG-DB merged commit d932fba into opensearch-project:main Jan 5, 2023
@Yury-Fridlyand Yury-Fridlyand deleted the integ-update-wiremock branch January 5, 2023 20:55
@Yury-Fridlyand
Copy link
Collaborator Author

@YANG-DB can you please add backport label?

@opensearch-trigger-bot
Copy link

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-46-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 d932fba740f73dc6bb0b6e87d3ebbfbf66fe4900
# Push it to GitHub
git push --set-upstream origin backport/backport-46-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-46-to-2.x.

Yury-Fridlyand added a commit to Bit-Quill/sql-jdbc that referenced this pull request Jan 5, 2023
Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
(cherry picked from commit d932fba)
Signed-off-by: Yury-Fridlyand <[email protected]>
YANG-DB pushed a commit that referenced this pull request Jan 5, 2023
Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
(cherry picked from commit d932fba)
Signed-off-by: Yury-Fridlyand <[email protected]>

Signed-off-by: Yury-Fridlyand <[email protected]>
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.

wiremock-2.27.2.jar: 7 vulnerabilities (highest severity is: 9.8) - autoclosed
2 participants