diff --git a/common/src/java/org/apache/hive/http/HttpServer.java b/common/src/java/org/apache/hive/http/HttpServer.java
index cb1ef743e3de..25fe72ec5077 100644
--- a/common/src/java/org/apache/hive/http/HttpServer.java
+++ b/common/src/java/org/apache/hive/http/HttpServer.java
@@ -661,7 +661,7 @@ ServerConnector createAndAddChannelConnector(int queueSize, Builder b) {
if (!b.useSSL) {
connector = new ServerConnector(webServer, http);
} else {
- SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(b.keyStorePath);
sslContextFactory.setKeyStoreType(b.keyStoreType == null || b.keyStoreType.isEmpty() ?
KeyStore.getDefaultType(): b.keyStoreType);
diff --git a/common/src/java/org/apache/hive/http/security/PamAuthenticator.java b/common/src/java/org/apache/hive/http/security/PamAuthenticator.java
index cbc19dd81600..7b48f2ff6a49 100644
--- a/common/src/java/org/apache/hive/http/security/PamAuthenticator.java
+++ b/common/src/java/org/apache/hive/http/security/PamAuthenticator.java
@@ -24,7 +24,7 @@
import org.eclipse.jetty.security.authentication.LoginAuthenticator;
import org.eclipse.jetty.server.Authentication;
import org.eclipse.jetty.server.UserIdentity;
-import org.eclipse.jetty.util.B64Code;
+import java.util.Base64;
import javax.security.sasl.AuthenticationException;
import javax.servlet.ServletRequest;
@@ -41,9 +41,9 @@
This class authenticates HS2 web UI via PAM. To authenticate use
* httpGet with header name "Authorization"
- * and header value "Basic authB64Code"
+ * and header value "Basic authBase64Code"
- where authB64Code is Base64 string for "login:password"
+ where authBase64Code is Base64 string for "login:password"
*/
public class PamAuthenticator extends LoginAuthenticator {
@@ -79,7 +79,8 @@ public Authentication validateRequest(ServletRequest req, ServletResponse res, b
String method = credentials.substring(0, space);
if ("basic".equalsIgnoreCase(method)) {
credentials = credentials.substring(space + 1);
- credentials = B64Code.decode(credentials, StandardCharsets.ISO_8859_1);
+ byte[] decodedBytes = Base64.getDecoder().decode(credentials);
+ credentials = new String(decodedBytes, StandardCharsets.ISO_8859_1);
int i = credentials.indexOf(':');
if (i > 0) {
String username = credentials.substring(0, i);
diff --git a/hcatalog/webhcat/svr/pom.xml b/hcatalog/webhcat/svr/pom.xml
index e83d67a6e2eb..b06f84f1f740 100644
--- a/hcatalog/webhcat/svr/pom.xml
+++ b/hcatalog/webhcat/svr/pom.xml
@@ -234,6 +234,10 @@
junit-vintage-engine
test
+
+ org.eclipse.jetty
+ jetty-util
+
diff --git a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java
index 2126d36ef8de..1e6dd11c3ea3 100644
--- a/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java
+++ b/hcatalog/webhcat/svr/src/main/java/org/apache/hive/hcatalog/templeton/Main.java
@@ -24,8 +24,9 @@
import com.sun.jersey.spi.container.servlet.ServletContainer;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashMap;
@@ -35,6 +36,7 @@
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
import org.apache.hadoop.security.authentication.server.KerberosAuthenticationHandler;
import org.apache.hadoop.hive.common.IPStackUtils;
+import org.eclipse.jetty.util.resource.PathResource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.apache.commons.lang3.StringUtils;
@@ -204,9 +206,11 @@ public Server runServer(int port)
if (StringUtils.isEmpty(conf.jettyConfiguration())) {
server = new Server(port);
} else {
- FileInputStream jettyConf = new FileInputStream(conf.jettyConfiguration());
- XmlConfiguration configuration = new XmlConfiguration(jettyConf);
- server = (Server)configuration.configure();
+ Path configPath = Paths.get(conf.jettyConfiguration());
+ PathResource jettyResource = new PathResource(configPath);
+
+ XmlConfiguration configuration = new XmlConfiguration(jettyResource);
+ server = (Server) configuration.configure();
}
ServletContextHandler root = new ServletContextHandler(server, "/");
@@ -289,7 +293,7 @@ private Connector createChannelConnector(Server server) {
if (conf.getBoolean(AppConfig.USE_SSL, false)) {
LOG.info("Using SSL for templeton.");
- SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
sslContextFactory.setKeyStorePath(conf.get(AppConfig.KEY_STORE_PATH, DEFAULT_KEY_STORE_PATH));
sslContextFactory.setKeyStorePassword(conf.get(AppConfig.KEY_STORE_PASSWORD, DEFAULT_KEY_STORE_PASSWORD));
Set excludedSSLProtocols = Sets.newHashSet(Splitter.on(",").trimResults().omitEmptyStrings()
diff --git a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestActivePassiveHA.java b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestActivePassiveHA.java
index f1c59ba0cbda..c81421711669 100644
--- a/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestActivePassiveHA.java
+++ b/itests/hive-unit/src/test/java/org/apache/hive/jdbc/TestActivePassiveHA.java
@@ -59,14 +59,13 @@
import org.apache.http.StatusLine;
import org.apache.http.util.EntityUtils;
import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.StringUtil;
+import java.util.Base64;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-
+import java.nio.charset.StandardCharsets;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -812,9 +811,9 @@ private String sendAuthMethod(HttpRequestBase method, boolean enableAuth, boolea
}
private void setupAuthHeaders(final HttpRequestBase method) {
- String authB64Code =
- B64Code.encode(ADMIN_USER + ":" + ADMIN_PASSWORD, StringUtil.__ISO_8859_1);
- method.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = ADMIN_USER + ":" + ADMIN_PASSWORD;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ method.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
}
private Map getConfOverlay(final String instanceId) {
diff --git a/itests/qtest-druid/pom.xml b/itests/qtest-druid/pom.xml
index 5227f9b05e28..f219d1df8b28 100644
--- a/itests/qtest-druid/pom.xml
+++ b/itests/qtest-druid/pom.xml
@@ -32,7 +32,7 @@
../..
4.0.0
1.19.3
- 9.4.57.v20241219
+ 10.0.24
10.11.1.1
16.0.1
4.1.0
diff --git a/packaging/src/license/licenses.xml b/packaging/src/license/licenses.xml
index f3f631bb50ad..63d374b19612 100644
--- a/packaging/src/license/licenses.xml
+++ b/packaging/src/license/licenses.xml
@@ -301,8 +301,8 @@
org.eclipse.jetty.websocket
- websocket-api
- 9.4.57.v20241219
+ websocket-jetty-api
+ 10.0.24
Apache Software License - Version 2.0
@@ -313,8 +313,8 @@
org.eclipse.jetty.websocket
- websocket-client
- 9.4.57.v20241219
+ websocket-jetty-client
+ 10.0.24
Apache Software License - Version 2.0
@@ -337,8 +337,8 @@
org.eclipse.jetty.websocket
- websocket-server
- 9.4.57.v20241219
+ websocket-jetty-server
+ 10.0.24
Apache Software License - Version 2.0
@@ -507,7 +507,7 @@
org.eclipse.jetty
jetty-server
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
@@ -531,7 +531,7 @@
org.eclipse.jetty
jetty-util-ajax
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
@@ -543,7 +543,7 @@
org.eclipse.jetty
jetty-util
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
diff --git a/pom.xml b/pom.xml
index 0d9fb17e16fd..d77641a40b1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,7 +160,7 @@
3.1.0
5.5.1
1.5.4
- 9.4.57.v20241219
+ 10.0.24
1.19.4
3.25.0
diff --git a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
index 795b8622e1b1..6be201e7bafd 100644
--- a/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
+++ b/service/src/java/org/apache/hive/service/cli/thrift/ThriftHttpCLIService.java
@@ -42,7 +42,6 @@
import org.apache.hadoop.hive.shims.ShimLoader;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.ExitUtil;
-import org.apache.hive.service.ServiceUtils;
import org.apache.hive.service.auth.AuthType;
import org.apache.hive.service.auth.HiveAuthFactory;
import org.apache.hive.service.auth.saml.HiveSamlHttpServlet;
@@ -56,10 +55,8 @@
import org.apache.thrift.protocol.TProtocolFactory;
import org.apache.thrift.server.TServlet;
import org.eclipse.jetty.io.Connection;
-import org.eclipse.jetty.io.EndPoint;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
-import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Server;
@@ -126,22 +123,18 @@ public void setThreadFactory(ThreadFactory threadFactory) {
conf.setResponseHeaderSize(responseHeaderSize);
conf.setSendServerVersion(false);
conf.setSendXPoweredBy(false);
- final HttpConnectionFactory http = new HttpConnectionFactory(conf) {
- public Connection newConnection(Connector connector, EndPoint endPoint) {
- Connection connection = super.newConnection(connector, endPoint);
- connection.addListener(new Connection.Listener() {
- public void onOpened(Connection connection) {
- openConnection();
- }
-
- public void onClosed(Connection connection) {
- closeConnection();
- }
- });
- return connection;
+ final HttpConnectionFactory http = new HttpConnectionFactory(conf);
+ http.addBean(new Connection.Listener() {
+ @Override
+ public void onOpened(Connection connection) {
+ openConnection();
}
- };
+ @Override
+ public void onClosed(Connection connection) {
+ closeConnection();
+ }
+ });
boolean useSsl = hiveConf.getBoolVar(ConfVars.HIVE_SERVER2_USE_SSL);
String schemeName = useSsl ? "https" : "http";
@@ -163,7 +156,7 @@ public void onClosed(Connection connection) {
if (keyStoreAlgorithm.isEmpty()) {
keyStoreAlgorithm = KeyManagerFactory.getDefaultAlgorithm();
}
- SslContextFactory sslContextFactory = new SslContextFactory.Server();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
String[] excludedProtocols = hiveConf.getVar(ConfVars.HIVE_SSL_PROTOCOL_BLACKLIST).split(",");
LOG.info("HTTP Server SSL: adding excluded protocols: " + Arrays.toString(excludedProtocols));
sslContextFactory.addExcludeProtocols(excludedProtocols);
diff --git a/service/src/test/org/apache/hive/service/server/TestHS2HttpServerLDAP.java b/service/src/test/org/apache/hive/service/server/TestHS2HttpServerLDAP.java
index f389d47a6618..d6963551ddab 100644
--- a/service/src/test/org/apache/hive/service/server/TestHS2HttpServerLDAP.java
+++ b/service/src/test/org/apache/hive/service/server/TestHS2HttpServerLDAP.java
@@ -35,10 +35,9 @@
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpParams;
import org.eclipse.jetty.http.HttpHeader;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.StringUtil;
-
+import java.util.Base64;
import java.nio.charset.StandardCharsets;
+
import java.util.List;
import java.util.Optional;
import org.junit.AfterClass;
@@ -89,8 +88,9 @@ public void testValidCredentialsWithAuthorizationHeader() throws Exception {
httpclient = builder.build();
HttpGet httpGet = new HttpGet("http://" + HOST + ":" + webUIPort + "/jmx");
- String authB64Code = B64Code.encode(VALID_USER + ":" + VALID_PASS, StringUtil.__ISO_8859_1);
- httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = VALID_USER + ":" + VALID_PASS;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
httpclient.execute(httpGet);
Assert.assertTrue(isAuthorized(httpCookieStore.getCookies()));
@@ -110,8 +110,9 @@ public void testInvalidCredentialsWithInAuthorizationHeader() throws Exception {
httpclient = builder.build();
HttpGet httpGet = new HttpGet("http://" + HOST + ":" + webUIPort + "/jmx");
- String authB64Code = B64Code.encode(INVALID_USER + ":" + INVALID_PASS, StringUtil.__ISO_8859_1);
- httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = INVALID_USER + ":" + INVALID_PASS;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
httpclient.execute(httpGet);
Assert.assertFalse(isAuthorized(httpCookieStore.getCookies()));
diff --git a/service/src/test/org/apache/hive/service/server/TestHS2HttpServerPam.java b/service/src/test/org/apache/hive/service/server/TestHS2HttpServerPam.java
index e62cda565be9..86ca7b89b259 100644
--- a/service/src/test/org/apache/hive/service/server/TestHS2HttpServerPam.java
+++ b/service/src/test/org/apache/hive/service/server/TestHS2HttpServerPam.java
@@ -27,8 +27,9 @@
import org.apache.http.impl.client.HttpClients;
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.server.UserIdentity;
-import org.eclipse.jetty.util.B64Code;
-import org.eclipse.jetty.util.StringUtil;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
@@ -90,8 +91,9 @@ public void testAuthorizedConnection() throws Exception {
httpclient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet("http://" + host + ":" + webUIPort);
- String authB64Code = B64Code.encode(username + ":" + password, StringUtil.__ISO_8859_1);
- httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = username + ":" + password;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
CloseableHttpResponse response = httpclient.execute(httpGet);
Assert.assertTrue(response.toString().contains(Integer.toString(HttpURLConnection.HTTP_OK)));
@@ -111,8 +113,9 @@ public void testIncorrectUser() throws Exception {
httpclient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet("http://" + host + ":" + webUIPort);
- String authB64Code = B64Code.encode(username + ":" + password, StringUtil.__ISO_8859_1);
- httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = username + ":" + password;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
CloseableHttpResponse response = httpclient.execute(httpGet);
Assert.assertTrue(response.toString().contains(Integer.toString(HttpURLConnection.HTTP_UNAUTHORIZED)));
@@ -132,8 +135,9 @@ public void testIncorrectPassword() throws Exception {
httpclient = HttpClients.createDefault();
HttpGet httpGet = new HttpGet("http://" + host + ":" + webUIPort);
- String authB64Code = B64Code.encode(username + ":" + password, StringUtil.__ISO_8859_1);
- httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authB64Code);
+ String credentials = username + ":" + password;
+ String authBase64Code = Base64.getEncoder().encodeToString(credentials.getBytes(StandardCharsets.ISO_8859_1));
+ httpGet.setHeader(HttpHeader.AUTHORIZATION.asString(), "Basic " + authBase64Code);
CloseableHttpResponse response = httpclient.execute(httpGet);
Assert.assertTrue(response.toString().contains(Integer.toString(HttpURLConnection.HTTP_UNAUTHORIZED)));
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
index 00135cddfb40..a13641763664 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
@@ -68,12 +68,14 @@
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
+import org.eclipse.jetty.http.HttpVersion;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.HttpConfiguration;
import org.eclipse.jetty.server.HttpConnectionFactory;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.security.Constraint;
@@ -380,9 +382,10 @@ public void setThreadFactory(ThreadFactory threadFactory) {
final HttpConnectionFactory http = new HttpConnectionFactory(httpServerConf);
- final SslContextFactory sslContextFactory = ServletSecurity.createSslContextFactory(conf);
+ final SslContextFactory.Server sslContextFactory = ServletSecurity.createSslContextFactory(conf);
if (sslContextFactory != null) {
- connector = new ServerConnector(server, sslContextFactory, http);
+ connector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory,
+ HttpVersion.HTTP_1_1.asString()), http);
} else {
connector = new ServerConnector(server, http);
}
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
index c5a83ef5d7ff..e7eaba823f47 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletSecurity.java
@@ -338,7 +338,7 @@ static void loginServerPrincipal(Configuration conf) throws IOException {
* @return null if no ssl in config, an instance otherwise
* @throws IOException if getting password fails
*/
- static SslContextFactory createSslContextFactory(Configuration conf) throws IOException {
+ static SslContextFactory.Server createSslContextFactory(Configuration conf) throws IOException {
final boolean useSsl = MetastoreConf.getBoolVar(conf, MetastoreConf.ConfVars.USE_SSL);
if (!useSsl) {
return null;
@@ -359,7 +359,7 @@ static SslContextFactory createSslContextFactory(Configuration conf) throws IOEx
if (LOG.isInfoEnabled()) {
LOG.info("HTTP Server SSL: adding excluded protocols: {}", Arrays.toString(excludedProtocols));
}
- SslContextFactory factory = new SslContextFactory.Server();
+ SslContextFactory.Server factory = new SslContextFactory.Server();
factory.addExcludeProtocols(excludedProtocols);
if (LOG.isInfoEnabled()) {
LOG.info("HTTP Server SSL: SslContextFactory.getExcludeProtocols = {}",
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletServerBuilder.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletServerBuilder.java
index 67f9c9961b6c..bc6a59f49780 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletServerBuilder.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/ServletServerBuilder.java
@@ -20,6 +20,7 @@
import static org.eclipse.jetty.util.URIUtil.HTTP;
import static org.eclipse.jetty.util.URIUtil.HTTPS;
+import org.eclipse.jetty.http.HttpVersion;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hive.metastore.conf.MetastoreConf;
@@ -28,6 +29,7 @@
import org.eclipse.jetty.server.SecureRequestCustomizer;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
+import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.gzip.GzipHandler;
@@ -173,7 +175,7 @@ private Server createServer() {
* @param port The port to bind the connector to
* @return The created ServerConnector
*/
- private ServerConnector createConnector(Server server, SslContextFactory sslContextFactory, int port) {
+ private ServerConnector createConnector(Server server, SslContextFactory.Server sslContextFactory, int port) {
final ServerConnector connector;
HttpConfiguration httpConf = new HttpConfiguration();
// Do not leak information
@@ -183,7 +185,8 @@ private ServerConnector createConnector(Server server, SslContextFactory sslCont
httpConf.setSecureScheme(HTTPS);
httpConf.setSecurePort(port);
httpConf.addCustomizer(new SecureRequestCustomizer());
- connector = new ServerConnector(server, sslContextFactory, new HttpConnectionFactory(httpConf));
+ connector = new ServerConnector(server,
+ new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()), new HttpConnectionFactory(httpConf));
connector.setName(HTTPS);
} else {
connector = new ServerConnector(server, new HttpConnectionFactory(httpConf));
@@ -209,7 +212,7 @@ private void addServlet(Map handlersMap, Descrip
ServletContextHandler handler = handlersMap.computeIfAbsent(key, p -> {
ServletContextHandler servletHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS);
servletHandler.setContextPath("/");
- servletHandler.setGzipHandler(new GzipHandler());
+ servletHandler.insertHandler(new GzipHandler());
return servletHandler;
});
ServletHolder servletHolder = new ServletHolder(servlet);
@@ -236,7 +239,7 @@ public Server startServer() throws Exception {
}
final Server server = createServer();
// create the connectors
- final SslContextFactory sslContextFactory = ServletSecurity.createSslContextFactory(configuration);
+ final SslContextFactory.Server sslContextFactory = ServletSecurity.createSslContextFactory(configuration);
final ServerConnector[] connectors = new ServerConnector[size];
final ServletContextHandler[] handlers = new ServletContextHandler[size];
Iterator> it = handlersMap.entrySet().iterator();
diff --git a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java
index 4146661f6c5c..9672d230e335 100644
--- a/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java
+++ b/standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/cache/SharedCache.java
@@ -80,7 +80,6 @@
import org.apache.hadoop.hive.metastore.utils.StringUtils;
import org.apache.hadoop.hive.ql.util.IncrementalObjectSizeEstimator;
import org.apache.hadoop.hive.ql.util.IncrementalObjectSizeEstimator.ObjectEstimator;
-import org.eclipse.jetty.util.ConcurrentHashSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -116,7 +115,7 @@ public class SharedCache {
private AtomicLong cacheUpdateCount = new AtomicLong(0);
private long maxCacheSizeInBytes = -1;
private HashMap, ObjectEstimator> sizeEstimators = null;
- private Set tableToUpdateSize = new ConcurrentHashSet<>();
+ private Set tableToUpdateSize = ConcurrentHashMap.newKeySet();
private ScheduledExecutorService executor = null;
private Map tableSizeMap = null;
diff --git a/standalone-metastore/packaging/src/license/licenses.xml b/standalone-metastore/packaging/src/license/licenses.xml
index f3f631bb50ad..63d374b19612 100644
--- a/standalone-metastore/packaging/src/license/licenses.xml
+++ b/standalone-metastore/packaging/src/license/licenses.xml
@@ -301,8 +301,8 @@
org.eclipse.jetty.websocket
- websocket-api
- 9.4.57.v20241219
+ websocket-jetty-api
+ 10.0.24
Apache Software License - Version 2.0
@@ -313,8 +313,8 @@
org.eclipse.jetty.websocket
- websocket-client
- 9.4.57.v20241219
+ websocket-jetty-client
+ 10.0.24
Apache Software License - Version 2.0
@@ -337,8 +337,8 @@
org.eclipse.jetty.websocket
- websocket-server
- 9.4.57.v20241219
+ websocket-jetty-server
+ 10.0.24
Apache Software License - Version 2.0
@@ -507,7 +507,7 @@
org.eclipse.jetty
jetty-server
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
@@ -531,7 +531,7 @@
org.eclipse.jetty
jetty-util-ajax
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
@@ -543,7 +543,7 @@
org.eclipse.jetty
jetty-util
- 9.4.57.v20241219
+ 10.0.24
Apache Software License - Version 2.0
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index 8c9f5256f91e..36f400c7df99 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -120,7 +120,7 @@
4.5.13
4.5.8
11.28
- 9.4.57.v20241219
+ 10.0.24
1.3.2
26.0.6