File tree 13 files changed +30
-38
lines changed
src/main/java/com/facebook/presto/server
main/java/com/facebook/presto/server
test/java/com/facebook/presto/server
src/main/java/com/facebook/presto/router
13 files changed +30
-38
lines changed Original file line number Diff line number Diff line change 66
66
<dep .asm.version>9.7.1</dep .asm.version>
67
67
<dep .gcs.version>1.9.17</dep .gcs.version>
68
68
<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>
70
70
<dep .kafka.version>3.9.0</dep .kafka.version>
71
71
<dep .pinot.version>0.11.0</dep .pinot.version>
72
72
<dep .druid.version>30.0.1</dep .druid.version>
1378
1378
</dependency >
1379
1379
1380
1380
<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 >
1384
1384
</dependency >
1385
1385
1386
1386
<dependency >
1387
- <groupId >io .airlift.resolver</groupId >
1387
+ <groupId >com.facebook .airlift.resolver</groupId >
1388
1388
<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 >
1390
1396
</dependency >
1391
1397
1392
1398
<dependency >
Original file line number Diff line number Diff line change 186
186
</dependencies >
187
187
188
188
<!-- 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 >
198
189
199
190
<build >
200
191
<plugins >
Original file line number Diff line number Diff line change 125
125
</dependency >
126
126
127
127
<dependency >
128
- <groupId >io .airlift.resolver</groupId >
128
+ <groupId >com.facebook .airlift.resolver</groupId >
129
129
<artifactId >resolver</artifactId >
130
130
</dependency >
131
131
132
132
<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 >
135
135
</dependency >
136
136
137
137
<dependency >
Original file line number Diff line number Diff line change 14
14
package com .facebook .presto .server ;
15
15
16
16
import com .facebook .airlift .log .Logger ;
17
+ import com .facebook .airlift .resolver .ArtifactResolver ;
17
18
import com .facebook .presto .metadata .FunctionAndTypeManager ;
18
19
import com .facebook .presto .spi .CoordinatorPlugin ;
19
20
import com .facebook .presto .spi .Plugin ;
20
21
import com .facebook .presto .spi .classloader .ThreadContextClassLoader ;
21
22
import com .google .common .collect .ImmutableList ;
22
23
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 ;
26
26
27
27
import javax .annotation .concurrent .ThreadSafe ;
28
28
import javax .inject .Inject ;
Original file line number Diff line number Diff line change 132
132
</dependency >
133
133
134
134
<dependency >
135
- <groupId >io .airlift.resolver</groupId >
135
+ <groupId >com.facebook .airlift.resolver</groupId >
136
136
<artifactId >resolver</artifactId >
137
137
</dependency >
138
138
273
273
</dependency >
274
274
275
275
<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 >
278
278
</dependency >
279
279
280
280
<dependency >
Original file line number Diff line number Diff line change 15
15
16
16
import com .google .common .collect .ImmutableList ;
17
17
import com .google .common .collect .ImmutableSet ;
18
+ import org .eclipse .aether .artifact .Artifact ;
18
19
import org .objectweb .asm .ClassReader ;
19
- import org .sonatype .aether .artifact .Artifact ;
20
20
21
21
import java .io .File ;
22
22
import java .io .IOException ;
Original file line number Diff line number Diff line change 15
15
16
16
import com .facebook .airlift .log .Logger ;
17
17
import com .facebook .airlift .node .NodeInfo ;
18
+ import com .facebook .airlift .resolver .ArtifactResolver ;
18
19
import com .facebook .presto .ClientRequestFilterManager ;
19
20
import com .facebook .presto .common .block .BlockEncoding ;
20
21
import com .facebook .presto .common .block .BlockEncodingManager ;
63
64
import com .facebook .presto .ttl .nodettlfetchermanagers .NodeTtlFetcherManager ;
64
65
import com .google .common .collect .ImmutableList ;
65
66
import com .google .common .collect .ImmutableSet ;
66
- import io .airlift .resolver .ArtifactResolver ;
67
67
68
68
import javax .annotation .concurrent .ThreadSafe ;
69
69
import javax .inject .Inject ;
Original file line number Diff line number Diff line change 15
15
16
16
import com .facebook .airlift .configuration .Config ;
17
17
import com .facebook .airlift .configuration .ConfigDescription ;
18
+ import com .facebook .airlift .resolver .ArtifactResolver ;
18
19
import com .google .common .base .Splitter ;
19
20
import com .google .common .collect .ImmutableList ;
20
21
import com .google .common .collect .ImmutableSet ;
21
- import io .airlift .resolver .ArtifactResolver ;
22
22
23
23
import javax .validation .constraints .NotNull ;
24
24
Original file line number Diff line number Diff line change 14
14
package com .facebook .presto .server ;
15
15
16
16
import com .facebook .airlift .log .Logger ;
17
+ import com .facebook .airlift .resolver .ArtifactResolver ;
17
18
import com .facebook .presto .metadata .Metadata ;
18
19
import com .facebook .presto .spi .CoordinatorPlugin ;
19
20
import com .facebook .presto .spi .Plugin ;
20
21
import com .facebook .presto .spi .RouterPlugin ;
21
22
import com .facebook .presto .spi .classloader .ThreadContextClassLoader ;
22
23
import com .google .common .collect .ImmutableList ;
23
24
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 ;
27
27
28
28
import java .io .File ;
29
29
import java .io .IOException ;
Original file line number Diff line number Diff line change 14
14
package com .facebook .presto .server ;
15
15
16
16
import com .facebook .airlift .configuration .testing .ConfigAssertions ;
17
+ import com .facebook .airlift .resolver .ArtifactResolver ;
17
18
import com .google .common .collect .ImmutableList ;
18
19
import com .google .common .collect .ImmutableMap ;
19
- import io .airlift .resolver .ArtifactResolver ;
20
20
import org .testng .annotations .Test ;
21
21
22
22
import java .io .File ;
Original file line number Diff line number Diff line change 248
248
<artifactId >presto-jdbc</artifactId >
249
249
<scope >test</scope >
250
250
</dependency >
251
- <dependency >
252
- <groupId >org.apache.commons</groupId >
253
- <artifactId >commons-lang3</artifactId >
254
- <scope >test</scope >
255
- </dependency >
256
251
</dependencies >
257
252
258
253
<build >
Original file line number Diff line number Diff line change 178
178
</dependency >
179
179
180
180
<dependency >
181
- <groupId >io .airlift.resolver</groupId >
181
+ <groupId >com.facebook .airlift.resolver</groupId >
182
182
<artifactId >resolver</artifactId >
183
183
</dependency >
184
184
Original file line number Diff line number Diff line change 14
14
package com .facebook .presto .router ;
15
15
16
16
import com .facebook .airlift .log .Logger ;
17
+ import com .facebook .airlift .resolver .ArtifactResolver ;
17
18
import com .facebook .presto .server .PluginInstaller ;
18
19
import com .facebook .presto .server .PluginManagerConfig ;
19
20
import com .facebook .presto .server .PluginManagerUtil ;
26
27
import com .facebook .presto .spi .security .PasswordAuthenticatorFactory ;
27
28
import com .facebook .presto .spi .security .PrestoAuthenticatorFactory ;
28
29
import com .google .common .collect .ImmutableList ;
29
- import io .airlift .resolver .ArtifactResolver ;
30
30
31
31
import javax .annotation .concurrent .ThreadSafe ;
32
32
import javax .inject .Inject ;
You can’t perform that action at this time.
0 commit comments