diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml
index d491c972737..ce889521ca8 100644
--- a/contrib/storage-hive/core/pom.xml
+++ b/contrib/storage-hive/core/pom.xml
@@ -257,10 +257,6 @@
reload4j
ch.qos.reload4j
-
- org.mortbay.jetty
- servlet-api-2.5
-
tomcat
jasper-compiler
diff --git a/distribution/src/assemble/component.xml b/distribution/src/assemble/component.xml
index e2b255269ca..6e6473a79e9 100644
--- a/distribution/src/assemble/component.xml
+++ b/distribution/src/assemble/component.xml
@@ -114,7 +114,7 @@
org.glassfish.jersey.core
org.reflections
org.glassfish.hk2.external
- org.mortbay.jetty
+ org.eclipse.jetty
javax.activation
javax.annotation
org.glassfish.jersey.containers
@@ -155,7 +155,7 @@
org.glassfish.jersey.core
org.reflections
org.glassfish.hk2.external
- org.mortbay.jetty
+ org.eclipse.jetty
javax.activation
javax.annotation
org.glassfish.jersey.containers
diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/core/ClusterDef.java b/drill-yarn/src/main/java/org/apache/drill/yarn/core/ClusterDef.java
index 223b6068de8..825da7c9720 100644
--- a/drill-yarn/src/main/java/org/apache/drill/yarn/core/ClusterDef.java
+++ b/drill-yarn/src/main/java/org/apache/drill/yarn/core/ClusterDef.java
@@ -22,13 +22,17 @@
import java.util.Map;
import org.apache.drill.yarn.appMaster.TaskSpec;
-import org.mortbay.log.Log;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigList;
import com.typesafe.config.ConfigValue;
public class ClusterDef {
+
+ private static Logger logger = LoggerFactory.getLogger(ClusterDef.class);
+
// The following keys are relative to the cluster group definition
public static final String GROUP_NAME = "name";
@@ -139,7 +143,7 @@ public LabeledGroup(Map pool, int index) {
super(pool, index, GroupType.LABELED);
drillbitLabelExpr = (String) pool.get(DRILLBIT_LABEL);
if (drillbitLabelExpr == null) {
- Log.warn("Labeled pool is missing the drillbit label expression ("
+ logger.warn("Labeled pool is missing the drillbit label expression ("
+ DRILLBIT_LABEL + "), will treat pool as basic.");
}
}
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index b2f4e1fae4b..6d0a06d4fd6 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -359,9 +359,8 @@
protobuf-java
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
- 6.1.26
joda-time
@@ -442,10 +441,6 @@
org.eclipse.jetty
jetty-servlet
-
- org.eclipse.jetty
- jetty-servlets
-
org.eclipse.jetty
jetty-security
@@ -845,9 +840,9 @@
unpack
- false
+ false
${calcite.groupId}
calcite-core
jar
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java
index dfaf380f04d..442c158f823 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionInitializer.java
@@ -30,7 +30,7 @@
import org.codehaus.janino.Java.CompilationUnit;
import org.codehaus.janino.Parser;
import org.codehaus.janino.Scanner;
-import org.mortbay.util.IO;
+import org.eclipse.jetty.util.IO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java
index 98a76cbe15d..c6ba0c18717 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java
@@ -28,7 +28,6 @@
import org.eclipse.jetty.security.DefaultIdentityService;
import org.eclipse.jetty.security.SpnegoLoginService;
import org.eclipse.jetty.server.UserIdentity;
-import org.eclipse.jetty.util.B64Code;
import org.ietf.jgss.GSSContext;
import org.ietf.jgss.GSSCredential;
import org.ietf.jgss.GSSException;
@@ -42,6 +41,7 @@
import java.lang.reflect.Field;
import java.security.Principal;
import java.security.PrivilegedExceptionAction;
+import java.util.Base64;
/**
* Custom implementation of DrillSpnegoLoginService to avoid the need of passing targetName in a config file,
@@ -94,7 +94,7 @@ public UserIdentity login(final String username, final Object credentials, Servl
private UserIdentity spnegoLogin(Object credentials, ServletRequest request) {
String encodedAuthToken = (String) credentials;
- byte[] authToken = B64Code.decode(encodedAuthToken);
+ byte[] authToken = Base64.getDecoder().decode(encodedAuthToken);
GSSManager manager = GSSManager.getInstance();
try {
@@ -149,4 +149,3 @@ private UserIdentity spnegoLogin(Object credentials, ServletRequest request) {
return null;
}
}
-
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java
index 3a745491abc..89421c69194 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfigurator.java
@@ -66,14 +66,14 @@ public SslContextFactoryConfigurator(DrillConfig config, String drillbitEndpoint
* @return new configured sslContextFactory
* @throws Exception when generation of self-signed certificate failed
*/
- public SslContextFactory configureNewSslContextFactory() throws Exception {
+ public SslContextFactory.Server configureNewSslContextFactory() throws Exception {
SSLConfig sslConf = new SSLConfigBuilder()
.config(config)
.mode(SSLConfig.Mode.SERVER)
.initializeSSLContext(false)
.validateKeyStore(true)
.build();
- final SslContextFactory sslContextFactory = new SslContextFactory();
+ SslContextFactory.Server sslContextFactory = new SslContextFactory.Server();
if (sslConf.isSslValid()) {
useOptionsConfiguredByUser(sslContextFactory, sslConf);
} else {
@@ -82,7 +82,7 @@ public SslContextFactory configureNewSslContextFactory() throws Exception {
return sslContextFactory;
}
- private void useOptionsConfiguredByUser(SslContextFactory sslFactory, SSLConfig sslConf) {
+ private void useOptionsConfiguredByUser(SslContextFactory.Server sslFactory, SSLConfig sslConf) {
logger.info("Using configured SSL settings for web server");
sslFactory.setKeyStorePath(sslConf.getKeyStorePath());
sslFactory.setKeyStorePassword(sslConf.getKeyStorePassword());
@@ -159,7 +159,7 @@ private void setIfPresent(String optKey, Function optGet, Consume
}
- private void useAutoGeneratedSelfSignedCertificate(SslContextFactory sslContextFactory) throws Exception {
+ private void useAutoGeneratedSelfSignedCertificate(SslContextFactory.Server sslContextFactory) throws Exception {
logger.info("Using generated self-signed SSL settings for web server");
final SecureRandom random = new SecureRandom();
diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfiguratorTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfiguratorTest.java
index f7dbdd7ec21..fdc37bc3473 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfiguratorTest.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/ssl/SslContextFactoryConfiguratorTest.java
@@ -62,7 +62,7 @@ public static void setUpClass() throws Exception {
@Test
public void configureNewSslContextFactory() throws Exception {
- SslContextFactory sslContextFactory = sslContextFactoryConfigurator.configureNewSslContextFactory();
+ SslContextFactory.Server sslContextFactory = sslContextFactoryConfigurator.configureNewSslContextFactory();
assertEquals(30, sslContextFactory.getSslSessionTimeout());
assertTrue(sslContextFactory.getWantClientAuth());
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 65fb5b1f6d0..d66822b0fc8 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -176,7 +176,7 @@
jetty-util
- org.mortbay.jetty
+ org.eclipse.jetty
freemarker
@@ -413,7 +413,7 @@
org.tukaani:*
org.apache.velocity:*
net.hydromatic:linq4j
- org.mortbay.jetty:*
+ org.eclipse.jetty:*
org.slf4j:jul-to-slf4j
org.hamcrest:hamcrest-core
org.mockito:mockito-core
@@ -870,7 +870,7 @@
org.apache.velocity:*
net.hydromatic:linq4j
org.codehaus.janino:*
- org.mortbay.jetty:*
+ org.eclipse.jetty:*
org.slf4j:jul-to-slf4j
org.slf4j:log4j-over-slf4j
org.hamcrest:hamcrest-core
diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml
index a00fc9331df..6f02d45fb0a 100644
--- a/exec/jdbc/pom.xml
+++ b/exec/jdbc/pom.xml
@@ -42,7 +42,7 @@
org.apache.drill
drill-logical
${project.version}
-
+
org.apache.drill.exec
drill-java-exec
@@ -66,7 +66,6 @@
foodmart-data-json
0.4
-
sqlline
sqlline
@@ -137,8 +136,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
diff --git a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java
index 186c9f86dfb..b233ab96474 100644
--- a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java
+++ b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java
@@ -22,7 +22,7 @@
import org.apache.drill.exec.record.MaterializedField;
import org.apache.drill.exec.record.TransferPair;
import org.apache.drill.exec.vector.complex.BaseRepeatedValueVector;
-import org.mortbay.jetty.servlet.Holder;
+import org.eclipse.jetty.servlet.Holder;
<@pp.dropOutputFile />
<#list vv.types as type>
diff --git a/pom.xml b/pom.xml
index c4e81ffcb44..5f25bef7f8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
0.9.10
1.11.2
4.2.19
- 9.4.44.v20210927
+ 9.4.51.v20230217
2.40
2.0.1.Final
9.5
@@ -1403,8 +1403,12 @@
${avro.version}
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
@@ -1415,8 +1419,12 @@
compile
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
commons-logging
@@ -1470,10 +1478,6 @@
javax.servlet
servlet-api
-
- org.mortbay.jetty
- servlet-api-2.5
-
org.apache.hadoop
hadoop-mapreduce-client-core
@@ -1522,8 +1526,12 @@
commons-logging-api
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
org.apache.hive
@@ -1696,8 +1704,12 @@
asm
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
org.json
@@ -2106,23 +2118,15 @@
${hadoop.version}
- org.mortbay.jetty
- servlet-api
-
-
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
-
-
- javax.servlet
- servlet-api
+ org.eclipse.jetty
+ jetty-servlet
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -2277,23 +2281,19 @@
tests
- org.mortbay.jetty
- servlet-api
-
-
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
servlet-api
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -2384,8 +2384,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
@@ -2420,8 +2424,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
@@ -2464,15 +2472,15 @@
servlet-api
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -2615,8 +2623,12 @@
io.netty
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
slf4j-log4j12
@@ -2749,20 +2761,12 @@
servlet-api
- servlet-api-2.5
- org.mortbay.jetty
-
-
- jsp-2.1
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-server
- jsp-api-2.1
- org.mortbay.jetty
-
-
- jetty-sslengine
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-servlet
jamon-runtime
@@ -2814,8 +2818,12 @@
servlet-api
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
commons-logging
@@ -2948,20 +2956,19 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
servlet-api
-
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -3048,19 +3055,19 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
servlet-api
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -3275,8 +3282,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
@@ -3298,8 +3309,12 @@
servlet-api
- servlet-api-2.5
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
commons-logging
@@ -3361,20 +3376,16 @@
servlet-api
- servlet-api-2.5
- org.mortbay.jetty
-
-
- jsp-2.1
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-server
- jsp-api-2.1
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-servlet
- jetty-sslengine
- org.mortbay.jetty
+ jetty-jsp
+ org.eclipse.jetty
jamon-runtime
@@ -3426,8 +3437,12 @@
servlet-api
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
commons-logging
@@ -3536,12 +3551,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
dnsjava
@@ -3563,12 +3578,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
@@ -3660,12 +3675,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
dnsjava
@@ -3687,12 +3702,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
@@ -3927,19 +3942,19 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
servlet-api
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -4018,19 +4033,19 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-servlet
javax.servlet
servlet-api
- org.mortbay.jetty
+ org.eclipse.jetty
jetty-util
@@ -4316,12 +4331,12 @@
commons-logging
- org.mortbay.jetty
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- javax.servlet
- servlet-api
+ org.eclipse.jetty
+ jetty-servlet
log4j
@@ -4335,12 +4350,12 @@
${hbase.version}
- javax.servlet
- servlet-api
+ org.eclipse.jetty
+ jetty-server
- servlet-api-2.5
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-servlet
commons-logging
@@ -4402,20 +4417,16 @@
servlet-api
- servlet-api-2.5
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-server
- jsp-2.1
- org.mortbay.jetty
+ org.eclipse.jetty
+ jetty-servlet
- jsp-api-2.1
- org.mortbay.jetty
-
-
- jetty-sslengine
- org.mortbay.jetty
+ jetty-jsp
+ org.eclipse.jetty
jamon-runtime
@@ -4467,8 +4478,12 @@
servlet-api
- org.mortbay.jetty
- servlet-api-2.5
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-servlet
commons-logging