Skip to content

Commit 8d6e688

Browse files
committed
Migrate io.airlift:resolver to com.facebook.airlift.resolver:resolver:1.7
1 parent d6a136c commit 8d6e688

File tree

13 files changed

+30
-38
lines changed

13 files changed

+30
-38
lines changed

pom.xml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<dep.asm.version>9.7.1</dep.asm.version>
6767
<dep.gcs.version>1.9.17</dep.gcs.version>
6868
<dep.alluxio.version>313</dep.alluxio.version>
69-
<dep.slf4j.version>1.7.36</dep.slf4j.version>
69+
<dep.slf4j.version>2.0.16</dep.slf4j.version>
7070
<dep.kafka.version>3.9.0</dep.kafka.version>
7171
<dep.pinot.version>0.11.0</dep.pinot.version>
7272
<dep.druid.version>30.0.1</dep.druid.version>
@@ -1378,15 +1378,21 @@
13781378
</dependency>
13791379

13801380
<dependency>
1381-
<groupId>org.sonatype.aether</groupId>
1382-
<artifactId>aether-api</artifactId>
1383-
<version>1.13.1</version>
1381+
<groupId>org.apache.maven.resolver</groupId>
1382+
<artifactId>maven-resolver-api</artifactId>
1383+
<version>1.9.22</version>
13841384
</dependency>
13851385

13861386
<dependency>
1387-
<groupId>io.airlift.resolver</groupId>
1387+
<groupId>com.facebook.airlift.resolver</groupId>
13881388
<artifactId>resolver</artifactId>
1389-
<version>1.4</version>
1389+
<version>1.7</version>
1390+
<exclusions>
1391+
<exclusion>
1392+
<groupId>com.google.inject</groupId>
1393+
<artifactId>guice</artifactId>
1394+
</exclusion>
1395+
</exclusions>
13901396
</dependency>
13911397

13921398
<dependency>

presto-cassandra/pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,6 @@
186186
</dependencies>
187187

188188
<!-- dependencyManagement is to fix the Require upper bound dependencies error for slf4j -->
189-
<dependencyManagement>
190-
<dependencies>
191-
<dependency>
192-
<groupId>org.slf4j</groupId>
193-
<artifactId>slf4j-api</artifactId>
194-
<version>1.7.36</version>
195-
</dependency>
196-
</dependencies>
197-
</dependencyManagement>
198189

199190
<build>
200191
<plugins>

presto-function-server/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,13 +125,13 @@
125125
</dependency>
126126

127127
<dependency>
128-
<groupId>io.airlift.resolver</groupId>
128+
<groupId>com.facebook.airlift.resolver</groupId>
129129
<artifactId>resolver</artifactId>
130130
</dependency>
131131

132132
<dependency>
133-
<groupId>org.sonatype.aether</groupId>
134-
<artifactId>aether-api</artifactId>
133+
<groupId>org.apache.maven.resolver</groupId>
134+
<artifactId>maven-resolver-api</artifactId>
135135
</dependency>
136136

137137
<dependency>

presto-function-server/src/main/java/com/facebook/presto/server/FunctionPluginManager.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
package com.facebook.presto.server;
1515

1616
import com.facebook.airlift.log.Logger;
17+
import com.facebook.airlift.resolver.ArtifactResolver;
1718
import com.facebook.presto.metadata.FunctionAndTypeManager;
1819
import com.facebook.presto.spi.CoordinatorPlugin;
1920
import com.facebook.presto.spi.Plugin;
2021
import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
2122
import com.google.common.collect.ImmutableList;
2223
import com.google.common.collect.Ordering;
23-
import io.airlift.resolver.ArtifactResolver;
24-
import io.airlift.resolver.DefaultArtifact;
25-
import org.sonatype.aether.artifact.Artifact;
24+
import org.eclipse.aether.artifact.Artifact;
25+
import org.eclipse.aether.artifact.DefaultArtifact;
2626

2727
import javax.annotation.concurrent.ThreadSafe;
2828
import javax.inject.Inject;

presto-main-base/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
</dependency>
133133

134134
<dependency>
135-
<groupId>io.airlift.resolver</groupId>
135+
<groupId>com.facebook.airlift.resolver</groupId>
136136
<artifactId>resolver</artifactId>
137137
</dependency>
138138

@@ -273,8 +273,8 @@
273273
</dependency>
274274

275275
<dependency>
276-
<groupId>org.sonatype.aether</groupId>
277-
<artifactId>aether-api</artifactId>
276+
<groupId>org.apache.maven.resolver</groupId>
277+
<artifactId>maven-resolver-api</artifactId>
278278
</dependency>
279279

280280
<dependency>

presto-main-base/src/main/java/com/facebook/presto/server/PluginDiscovery.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515

1616
import com.google.common.collect.ImmutableList;
1717
import com.google.common.collect.ImmutableSet;
18+
import org.eclipse.aether.artifact.Artifact;
1819
import org.objectweb.asm.ClassReader;
19-
import org.sonatype.aether.artifact.Artifact;
2020

2121
import java.io.File;
2222
import java.io.IOException;

presto-main-base/src/main/java/com/facebook/presto/server/PluginManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
import com.facebook.airlift.log.Logger;
1717
import com.facebook.airlift.node.NodeInfo;
18+
import com.facebook.airlift.resolver.ArtifactResolver;
1819
import com.facebook.presto.ClientRequestFilterManager;
1920
import com.facebook.presto.common.block.BlockEncoding;
2021
import com.facebook.presto.common.block.BlockEncodingManager;
@@ -63,7 +64,6 @@
6364
import com.facebook.presto.ttl.nodettlfetchermanagers.NodeTtlFetcherManager;
6465
import com.google.common.collect.ImmutableList;
6566
import com.google.common.collect.ImmutableSet;
66-
import io.airlift.resolver.ArtifactResolver;
6767

6868
import javax.annotation.concurrent.ThreadSafe;
6969
import javax.inject.Inject;

presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515

1616
import com.facebook.airlift.configuration.Config;
1717
import com.facebook.airlift.configuration.ConfigDescription;
18+
import com.facebook.airlift.resolver.ArtifactResolver;
1819
import com.google.common.base.Splitter;
1920
import com.google.common.collect.ImmutableList;
2021
import com.google.common.collect.ImmutableSet;
21-
import io.airlift.resolver.ArtifactResolver;
2222

2323
import javax.validation.constraints.NotNull;
2424

presto-main-base/src/main/java/com/facebook/presto/server/PluginManagerUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
package com.facebook.presto.server;
1515

1616
import com.facebook.airlift.log.Logger;
17+
import com.facebook.airlift.resolver.ArtifactResolver;
1718
import com.facebook.presto.metadata.Metadata;
1819
import com.facebook.presto.spi.CoordinatorPlugin;
1920
import com.facebook.presto.spi.Plugin;
2021
import com.facebook.presto.spi.RouterPlugin;
2122
import com.facebook.presto.spi.classloader.ThreadContextClassLoader;
2223
import com.google.common.collect.ImmutableList;
2324
import com.google.common.collect.Ordering;
24-
import io.airlift.resolver.ArtifactResolver;
25-
import io.airlift.resolver.DefaultArtifact;
26-
import org.sonatype.aether.artifact.Artifact;
25+
import org.eclipse.aether.artifact.Artifact;
26+
import org.eclipse.aether.artifact.DefaultArtifact;
2727

2828
import java.io.File;
2929
import java.io.IOException;

presto-main-base/src/test/java/com/facebook/presto/server/TestPluginManagerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
package com.facebook.presto.server;
1515

1616
import com.facebook.airlift.configuration.testing.ConfigAssertions;
17+
import com.facebook.airlift.resolver.ArtifactResolver;
1718
import com.google.common.collect.ImmutableList;
1819
import com.google.common.collect.ImmutableMap;
19-
import io.airlift.resolver.ArtifactResolver;
2020
import org.testng.annotations.Test;
2121

2222
import java.io.File;

presto-native-execution/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,11 +248,6 @@
248248
<artifactId>presto-jdbc</artifactId>
249249
<scope>test</scope>
250250
</dependency>
251-
<dependency>
252-
<groupId>org.apache.commons</groupId>
253-
<artifactId>commons-lang3</artifactId>
254-
<scope>test</scope>
255-
</dependency>
256251
</dependencies>
257252

258253
<build>

presto-router/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@
178178
</dependency>
179179

180180
<dependency>
181-
<groupId>io.airlift.resolver</groupId>
181+
<groupId>com.facebook.airlift.resolver</groupId>
182182
<artifactId>resolver</artifactId>
183183
</dependency>
184184

presto-router/src/main/java/com/facebook/presto/router/RouterPluginManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
package com.facebook.presto.router;
1515

1616
import com.facebook.airlift.log.Logger;
17+
import com.facebook.airlift.resolver.ArtifactResolver;
1718
import com.facebook.presto.server.PluginInstaller;
1819
import com.facebook.presto.server.PluginManagerConfig;
1920
import com.facebook.presto.server.PluginManagerUtil;
@@ -26,7 +27,6 @@
2627
import com.facebook.presto.spi.security.PasswordAuthenticatorFactory;
2728
import com.facebook.presto.spi.security.PrestoAuthenticatorFactory;
2829
import com.google.common.collect.ImmutableList;
29-
import io.airlift.resolver.ArtifactResolver;
3030

3131
import javax.annotation.concurrent.ThreadSafe;
3232
import javax.inject.Inject;

0 commit comments

Comments
 (0)