diff --git a/pom.xml b/pom.xml
index 4f55cf8066d9a..d2d9c3b5ce6cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
9.7.1
1.9.17
313
- 1.7.36
+ 2.0.16
3.9.0
0.11.0
30.0.1
@@ -1378,15 +1378,21 @@
- org.sonatype.aether
- aether-api
- 1.13.1
+ org.apache.maven.resolver
+ maven-resolver-api
+ 1.9.22
- io.airlift.resolver
+ com.facebook.airlift.resolver
resolver
- 1.4
+ 1.7
+
+
+ com.google.inject
+ guice
+
+
diff --git a/presto-cassandra/pom.xml b/presto-cassandra/pom.xml
index 28b6a839bd76d..80eba71eb6913 100644
--- a/presto-cassandra/pom.xml
+++ b/presto-cassandra/pom.xml
@@ -186,15 +186,6 @@
-
-
-
- org.slf4j
- slf4j-api
- 1.7.36
-
-
-
diff --git a/presto-function-server/pom.xml b/presto-function-server/pom.xml
index 99a4992f66bdc..7dd1d03c6e931 100644
--- a/presto-function-server/pom.xml
+++ b/presto-function-server/pom.xml
@@ -125,13 +125,13 @@
- io.airlift.resolver
+ com.facebook.airlift.resolver
resolver
- org.sonatype.aether
- aether-api
+ org.apache.maven.resolver
+ maven-resolver-api
diff --git a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java
index ce337f9d96da7..dc4e899d2818f 100644
--- a/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java
+++ b/presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java
@@ -14,15 +14,15 @@
package com.facebook.presto.server;
import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.facebook.presto.metadata.FunctionAndTypeManager;
import com.facebook.presto.spi.CoordinatorPlugin;
import com.facebook.presto.spi.Plugin;
import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
-import io.airlift.resolver.ArtifactResolver;
-import io.airlift.resolver.DefaultArtifact;
-import org.sonatype.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
import javax.annotation.concurrent.ThreadSafe;
import javax.inject.Inject;
diff --git a/presto-main-base/pom.xml b/presto-main-base/pom.xml
index b9a5b2d3f5a6b..d86f9633caf12 100644
--- a/presto-main-base/pom.xml
+++ b/presto-main-base/pom.xml
@@ -132,7 +132,7 @@
- io.airlift.resolver
+ com.facebook.airlift.resolver
resolver
@@ -273,8 +273,8 @@
- org.sonatype.aether
- aether-api
+ org.apache.maven.resolver
+ maven-resolver-api
diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginDiscovery.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginDiscovery.java
index 6c0d1f4fe9ef1..71e7370ca7b86 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginDiscovery.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginDiscovery.java
@@ -15,8 +15,8 @@
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import org.eclipse.aether.artifact.Artifact;
import org.objectweb.asm.ClassReader;
-import org.sonatype.aether.artifact.Artifact;
import java.io.File;
import java.io.IOException;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java
index 0693d90bb9cc3..4e2bf21732978 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java
@@ -15,6 +15,7 @@
import com.facebook.airlift.log.Logger;
import com.facebook.airlift.node.NodeInfo;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.facebook.presto.ClientRequestFilterManager;
import com.facebook.presto.common.block.BlockEncoding;
import com.facebook.presto.common.block.BlockEncodingManager;
@@ -63,7 +64,6 @@
import com.facebook.presto.ttl.nodettlfetchermanagers.NodeTtlFetcherManager;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import io.airlift.resolver.ArtifactResolver;
import javax.annotation.concurrent.ThreadSafe;
import javax.inject.Inject;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java
index e58ac4a0e6634..cb0bbc04db8da 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java
@@ -15,10 +15,10 @@
import com.facebook.airlift.configuration.Config;
import com.facebook.airlift.configuration.ConfigDescription;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
-import io.airlift.resolver.ArtifactResolver;
import javax.validation.constraints.NotNull;
diff --git a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java
index 9be5916ff4692..97b4bab2d2c05 100644
--- a/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java
+++ b/presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java
@@ -14,6 +14,7 @@
package com.facebook.presto.server;
import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.facebook.presto.metadata.Metadata;
import com.facebook.presto.spi.CoordinatorPlugin;
import com.facebook.presto.spi.Plugin;
@@ -21,9 +22,8 @@
import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
-import io.airlift.resolver.ArtifactResolver;
-import io.airlift.resolver.DefaultArtifact;
-import org.sonatype.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
import java.io.File;
import java.io.IOException;
diff --git a/presto-main-base/src/test/java/com/facebook/presto/server/TestPluginManagerConfig.java b/presto-main-base/src/test/java/com/facebook/presto/server/TestPluginManagerConfig.java
index 7ba6a0464db0d..fedaf7c270b7d 100644
--- a/presto-main-base/src/test/java/com/facebook/presto/server/TestPluginManagerConfig.java
+++ b/presto-main-base/src/test/java/com/facebook/presto/server/TestPluginManagerConfig.java
@@ -14,9 +14,9 @@
package com.facebook.presto.server;
import com.facebook.airlift.configuration.testing.ConfigAssertions;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
-import io.airlift.resolver.ArtifactResolver;
import org.testng.annotations.Test;
import java.io.File;
diff --git a/presto-native-execution/pom.xml b/presto-native-execution/pom.xml
index 506fb2f215a04..ff6946e764878 100644
--- a/presto-native-execution/pom.xml
+++ b/presto-native-execution/pom.xml
@@ -248,11 +248,6 @@
presto-jdbc
test
-
- org.apache.commons
- commons-lang3
- test
-
diff --git a/presto-router/pom.xml b/presto-router/pom.xml
index 9034e9af2506a..ba19f9b146247 100755
--- a/presto-router/pom.xml
+++ b/presto-router/pom.xml
@@ -178,7 +178,7 @@
- io.airlift.resolver
+ com.facebook.airlift.resolver
resolver
diff --git a/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java b/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java
index 9dd97cd349599..a769cbf294c2e 100644
--- a/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java
+++ b/presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java
@@ -14,6 +14,7 @@
package com.facebook.presto.router;
import com.facebook.airlift.log.Logger;
+import com.facebook.airlift.resolver.ArtifactResolver;
import com.facebook.presto.server.PluginInstaller;
import com.facebook.presto.server.PluginManagerConfig;
import com.facebook.presto.server.PluginManagerUtil;
@@ -26,7 +27,6 @@
import com.facebook.presto.spi.security.PasswordAuthenticatorFactory;
import com.facebook.presto.spi.security.PrestoAuthenticatorFactory;
import com.google.common.collect.ImmutableList;
-import io.airlift.resolver.ArtifactResolver;
import javax.annotation.concurrent.ThreadSafe;
import javax.inject.Inject;