Revert "fix(deps): update dependency com.linecorp.armeria:armeria-bom to v1.31.0 (#1542)" #1546
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… to v1.31.0 (open-telemetry#1542)" This reverts commit 0b7233e.
jack-berg
reviewed
Nov 18, 2024
| @@ -69,7 +68,7 @@ static class HttpsServerTest { | |||
| new ServerExtension() { | |||
| @Override | |||
| protected void configure(ServerBuilder sb) { | |||
| sb.tls(TlsKeyPair.of(certificate.privateKeyFile(), certificate.certificateFile())); | |||
| sb.tls(certificate.certificateFile(), certificate.privateKeyFile()); | |||
There was a problem hiding this comment.
Check out what I did in core to fix this deprecation: https://github.com/open-telemetry/opentelemetry-java/pull/6877/files
Suggested change
| sb.tls(certificate.certificateFile(), certificate.privateKeyFile()); | |
| sb.tls(TlsKeyPair.of(certificate.privateKey(), certificate.certificate())); |
There was a problem hiding this comment.
will fix when renovate re-opens, just want to roll this back which should never have been merged in the first place (#1545)
jack-berg
approved these changes
Nov 18, 2024
This was referenced Nov 18, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
#1542 was merged even though there was a failing test, this PR reverts that change until we can figure out what the underlying issue is (renovate should dutifully re-open the update).
#1545 fixes CI to prevent merging in the future when there is a failing test.