Skip to content

MINOR: Upgrade jetty to 9.4.27.v20200227 and jersey to 2.31 #8859

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.

Sign up for GitHub

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
kkonstantine merged 2 commits into from
Jun 17, 2020
Merged

MINOR: Upgrade jetty to 9.4.27.v20200227 and jersey to 2.31 #8859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97bcbb6
MINOR: Upgrading jersey and jetty versions
akatona84 Jun 12, 2020
baa9dde
Revert "KAFKA-9771: Port patch for inter-worker Connect SSL from Jett…
akatona84 Jun 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions connect/runtime/src/main/java/org/apache/kafka/connect/runtime/rest/util/SSLUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.kafka.connect.runtime.WorkerConfig;
import org.eclipse.jetty.util.ssl.SslContextFactory;

import javax.net.ssl.X509ExtendedKeyManager;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -65,20 +64,7 @@ public static SslContextFactory createServerSideSslContextFactory(WorkerConfig c
public static SslContextFactory createClientSideSslContextFactory(WorkerConfig config) {
Map<String, Object> sslConfigValues = config.valuesWithPrefixAllOrNothing("listeners.https.");

// Override this method in order to avoid running into
// https://github.com/eclipse/jetty.project/issues/4385, which would otherwise cause this to
// break when the keystore contains multiple certificates.
// The override here matches the bug fix in Jetty for that issue:
// https://github.com/eclipse/jetty.project/pull/4404/files#diff-58640db0f8f2cd84b7e653d1c1540913R2188-R2193
// TODO: Remove this override when the version of Jetty for the framework is bumped to
// 9.4.25 or later
final SslContextFactory.Client ssl = new SslContextFactory.Client() {
@Override
@SuppressWarnings("deprecation")
protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager) {
return keyManager;
}
};
final SslContextFactory.Client ssl = new SslContextFactory.Client();

configureSslContextFactoryKeyStore(ssl, sslConfigValues);
configureSslContextFactoryTrustStore(ssl, sslConfigValues);
Expand Down
7 changes: 2 additions & 5 deletions gradle/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,8 @@ versions += [
easymock: "4.2",
jackson: "2.10.2",
jacoco: "0.8.5",
// 9.4.25 renamed closeOutput to completeOutput (https://github.com/eclipse/jetty.project/commit/c5acf965067478784b54e2d241ec58fdb0b2c9fe)
// which is a method used by recent Jersey versions when this comment was written (2.30.1 was the latest). Please
// verify that this is fixed in some way before bumping the Jetty version.
jetty: "9.4.24.v20191120",
jersey: "2.28",
jetty: "9.4.27.v20200227",
jersey: "2.31",
jmh: "1.23",
hamcrest: "2.2",
log4j: "1.2.17",
Expand Down