Skip to content

Commit dc97f92

Browse files
tdcmeehantdcmeehan
authored
Merge pull request #2 from infvg/rework-maven
Reworked to use maven resolver
2 parents 40f6dad + 263ff8c commit dc97f92

17 files changed

+1230
-857
lines changed

‎pom.xml

+77-66
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<parent>
55
<groupId>io.airlift</groupId>
66
<artifactId>airbase</artifactId>
7-
<version>80</version>
7+
<version>134</version>
88
</parent>
99

1010
<groupId>io.airlift.resolver</groupId>
1111
<artifactId>resolver-root</artifactId>
12-
<version>1.7-SNAPSHOT</version>
12+
<version>1.7.4-wxd</version>
1313
<packaging>pom</packaging>
1414

1515
<description>Resolve the dependencies of Maven coordinates or POM file</description>
@@ -23,8 +23,8 @@
2323
</scm>
2424

2525
<properties>
26-
<dep.aether.version>1.13.1</dep.aether.version>
27-
<dep.maven.version>3.0.4</dep.maven.version>
26+
<dep.aether.version>1.9.6</dep.aether.version>
27+
<dep.maven.version>3.8.7</dep.maven.version>
2828

2929
<air.check.skip-extended>true</air.check.skip-extended>
3030
</properties>
@@ -43,63 +43,52 @@
4343
</dependency>
4444

4545
<dependency>
46-
<groupId>org.sonatype.aether</groupId>
47-
<artifactId>aether-spi</artifactId>
46+
<groupId>org.apache.maven.resolver</groupId>
47+
<artifactId>maven-resolver-spi</artifactId>
4848
<version>${dep.aether.version}</version>
4949
</dependency>
5050

5151
<dependency>
52-
<groupId>org.sonatype.aether</groupId>
53-
<artifactId>aether-api</artifactId>
52+
<groupId>org.apache.maven.resolver</groupId>
53+
<artifactId>maven-resolver-api</artifactId>
5454
<version>${dep.aether.version}</version>
5555
</dependency>
5656

5757
<dependency>
58-
<groupId>org.sonatype.aether</groupId>
59-
<artifactId>aether-impl</artifactId>
58+
<groupId>org.apache.maven.resolver</groupId>
59+
<artifactId>maven-resolver-impl</artifactId>
6060
<version>${dep.aether.version}</version>
6161
</dependency>
6262

6363
<dependency>
64-
<groupId>org.sonatype.aether</groupId>
65-
<artifactId>aether-util</artifactId>
64+
<groupId>org.apache.maven.resolver</groupId>
65+
<artifactId>maven-resolver-util</artifactId>
6666
<version>${dep.aether.version}</version>
6767
</dependency>
6868

6969
<dependency>
70-
<groupId>org.sonatype.aether</groupId>
71-
<artifactId>aether-connector-file</artifactId>
70+
<groupId>org.apache.maven.resolver</groupId>
71+
<artifactId>maven-resolver-connector-basic</artifactId>
7272
<version>${dep.aether.version}</version>
7373
</dependency>
7474

7575
<dependency>
76-
<groupId>org.sonatype.aether</groupId>
77-
<artifactId>aether-connector-asynchttpclient</artifactId>
76+
<groupId>org.apache.maven.resolver</groupId>
77+
<artifactId>maven-resolver-transport-file</artifactId>
7878
<version>${dep.aether.version}</version>
79-
<exclusions>
80-
<exclusion>
81-
<groupId>org.jboss.netty</groupId>
82-
<artifactId>netty</artifactId>
83-
</exclusion>
84-
</exclusions>
8579
</dependency>
8680

8781
<dependency>
88-
<groupId>io.netty</groupId>
89-
<artifactId>netty</artifactId>
90-
<version>3.6.2.Final</version>
82+
<groupId>org.apache.maven.resolver</groupId>
83+
<artifactId>maven-resolver-transport-http</artifactId>
84+
<version>${dep.aether.version}</version>
9185
</dependency>
9286

87+
<!-- http-client 4.5.x uses old 1.11 -->
9388
<dependency>
94-
<groupId>org.apache.maven</groupId>
95-
<artifactId>maven-core</artifactId>
96-
<version>${dep.maven.version}</version>
97-
<exclusions>
98-
<exclusion>
99-
<groupId>org.sonatype.sisu</groupId>
100-
<artifactId>sisu-inject-plexus</artifactId>
101-
</exclusion>
102-
</exclusions>
89+
<groupId>commons-codec</groupId>
90+
<artifactId>commons-codec</artifactId>
91+
<version>1.15</version>
10392
</dependency>
10493

10594
<dependency>
@@ -116,54 +105,76 @@
116105

117106
<dependency>
118107
<groupId>org.apache.maven</groupId>
119-
<artifactId>maven-aether-provider</artifactId>
108+
<artifactId>maven-resolver-provider</artifactId>
120109
<version>${dep.maven.version}</version>
121110
</dependency>
122111

123112
<dependency>
124113
<groupId>org.apache.maven</groupId>
125-
<artifactId>maven-embedder</artifactId>
114+
<artifactId>maven-core</artifactId>
126115
<version>${dep.maven.version}</version>
127-
<exclusions>
128-
<exclusion>
129-
<groupId>org.sonatype.sisu</groupId>
130-
<artifactId>sisu-inject-plexus</artifactId>
131-
</exclusion>
132-
<exclusion>
133-
<groupId>commons-cli</groupId>
134-
<artifactId>commons-cli</artifactId>
135-
</exclusion>
136-
</exclusions>
116+
</dependency>
117+
118+
<!-- TODO: remove Maven2 compat bits -->
119+
<dependency>
120+
<groupId>org.apache.maven</groupId>
121+
<artifactId>maven-compat</artifactId>
122+
<version>${dep.maven.version}</version>
123+
<scope>runtime</scope>
137124
</dependency>
138125

139126
<dependency>
140127
<groupId>org.codehaus.plexus</groupId>
141-
<artifactId>plexus-container-default</artifactId>
142-
<version>1.5.5</version>
128+
<artifactId>plexus-utils</artifactId>
129+
<version>3.5.1</version>
130+
</dependency>
131+
132+
<!-- DI: Sisu -->
133+
<dependency>
134+
<groupId>javax.inject</groupId>
135+
<artifactId>javax.inject</artifactId>
136+
<version>1</version>
137+
</dependency>
138+
<dependency>
139+
<groupId>org.eclipse.sisu</groupId>
140+
<artifactId>org.eclipse.sisu.inject</artifactId>
141+
<version>0.3.5</version>
142+
<scope>runtime</scope>
143+
</dependency>
144+
<!-- TODO: remove Plexus DI bits -->
145+
<dependency>
146+
<groupId>org.codehaus.plexus</groupId>
147+
<artifactId>plexus-classworlds</artifactId>
148+
<version>2.6.0</version>
149+
</dependency>
150+
<!-- TODO: remove Plexus DI bits -->
151+
<dependency>
152+
<groupId>org.eclipse.sisu</groupId>
153+
<artifactId>org.eclipse.sisu.plexus</artifactId>
154+
<version>0.3.5</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>com.google.inject</groupId>
158+
<artifactId>guice</artifactId>
159+
<version>4.2.3</version>
160+
<scope>runtime</scope>
161+
</dependency>
162+
<dependency>
163+
<groupId>com.google.guava</groupId>
164+
<artifactId>guava</artifactId>
165+
<version>31.1-jre</version>
143166
<exclusions>
144167
<exclusion>
145-
<groupId>commons-logging</groupId>
146-
<artifactId>commons-logging-api</artifactId>
147-
</exclusion>
148-
<exclusion>
149-
<groupId>com.google.collections</groupId>
150-
<artifactId>google-collections</artifactId>
151-
</exclusion>
152-
<exclusion>
153-
<groupId>junit</groupId>
154-
<artifactId>junit</artifactId>
155-
</exclusion>
156-
<exclusion>
157-
<groupId>log4j</groupId>
158-
<artifactId>log4j</artifactId>
168+
<groupId>com.google.guava</groupId>
169+
<artifactId>listenablefuture</artifactId>
159170
</exclusion>
160171
</exclusions>
161172
</dependency>
162-
163173
<dependency>
164-
<groupId>org.codehaus.plexus</groupId>
165-
<artifactId>plexus-classworlds</artifactId>
166-
<version>2.4</version>
174+
<groupId>com.google.guava</groupId>
175+
<artifactId>failureaccess</artifactId>
176+
<version>1.0.1</version>
177+
<scope>runtime</scope>
167178
</dependency>
168179
</dependencies>
169180
</dependencyManagement>

‎resolver-integration/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.airlift.resolver</groupId>
66
<artifactId>resolver-root</artifactId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7.4-wxd</version>
88
</parent>
99

1010
<groupId>io.airlift.resolver</groupId>
@@ -30,8 +30,8 @@
3030
</dependency>
3131

3232
<dependency>
33-
<groupId>org.sonatype.aether</groupId>
34-
<artifactId>aether-api</artifactId>
33+
<groupId>org.apache.maven.resolver</groupId>
34+
<artifactId>maven-resolver-api</artifactId>
3535
<scope>test</scope>
3636
</dependency>
3737

‎resolver-integration/src/test/java/io/airlift/resolver/TestArtifactResolve.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
*/
1414
package io.airlift.resolver;
1515

16-
import org.sonatype.aether.artifact.Artifact;
16+
import org.eclipse.aether.artifact.Artifact;
17+
import org.eclipse.aether.artifact.DefaultArtifact;
1718
import org.testng.Assert;
1819
import org.testng.annotations.Test;
1920

‎resolver/pom.xml

+23-26
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.airlift.resolver</groupId>
66
<artifactId>resolver-root</artifactId>
7-
<version>1.7-SNAPSHOT</version>
7+
<version>1.7.4-wxd</version>
88
</parent>
99

1010
<groupId>io.airlift.resolver</groupId>
@@ -16,44 +16,43 @@
1616

1717
<dependencies>
1818
<dependency>
19-
<groupId>org.sonatype.aether</groupId>
20-
<artifactId>aether-spi</artifactId>
19+
<groupId>javax.inject</groupId>
20+
<artifactId>javax.inject</artifactId>
2121
</dependency>
2222

2323
<dependency>
24-
<groupId>org.sonatype.aether</groupId>
25-
<artifactId>aether-api</artifactId>
24+
<groupId>org.apache.maven.resolver</groupId>
25+
<artifactId>maven-resolver-spi</artifactId>
2626
</dependency>
2727

2828
<dependency>
29-
<groupId>org.sonatype.aether</groupId>
30-
<artifactId>aether-impl</artifactId>
29+
<groupId>org.apache.maven.resolver</groupId>
30+
<artifactId>maven-resolver-api</artifactId>
3131
</dependency>
3232

3333
<dependency>
34-
<groupId>org.sonatype.aether</groupId>
35-
<artifactId>aether-util</artifactId>
34+
<groupId>org.apache.maven.resolver</groupId>
35+
<artifactId>maven-resolver-impl</artifactId>
3636
</dependency>
3737

3838
<dependency>
39-
<groupId>org.sonatype.aether</groupId>
40-
<artifactId>aether-connector-file</artifactId>
39+
<groupId>org.apache.maven.resolver</groupId>
40+
<artifactId>maven-resolver-util</artifactId>
4141
</dependency>
4242

4343
<dependency>
44-
<groupId>org.sonatype.aether</groupId>
45-
<artifactId>aether-connector-asynchttpclient</artifactId>
44+
<groupId>org.apache.maven.resolver</groupId>
45+
<artifactId>maven-resolver-connector-basic</artifactId>
4646
</dependency>
4747

4848
<dependency>
49-
<groupId>io.netty</groupId>
50-
<artifactId>netty</artifactId>
51-
<scope>runtime</scope>
49+
<groupId>org.apache.maven.resolver</groupId>
50+
<artifactId>maven-resolver-transport-file</artifactId>
5251
</dependency>
5352

5453
<dependency>
55-
<groupId>org.apache.maven</groupId>
56-
<artifactId>maven-core</artifactId>
54+
<groupId>org.apache.maven.resolver</groupId>
55+
<artifactId>maven-resolver-transport-http</artifactId>
5756
</dependency>
5857

5958
<dependency>
@@ -68,18 +67,17 @@
6867

6968
<dependency>
7069
<groupId>org.apache.maven</groupId>
71-
<artifactId>maven-aether-provider</artifactId>
70+
<artifactId>maven-resolver-provider</artifactId>
7271
</dependency>
7372

7473
<dependency>
7574
<groupId>org.apache.maven</groupId>
76-
<artifactId>maven-embedder</artifactId>
77-
<scope>runtime</scope>
75+
<artifactId>maven-core</artifactId>
7876
</dependency>
7977

8078
<dependency>
81-
<groupId>org.codehaus.plexus</groupId>
82-
<artifactId>plexus-container-default</artifactId>
79+
<groupId>org.apache.maven</groupId>
80+
<artifactId>maven-compat</artifactId>
8381
</dependency>
8482

8583
<dependency>
@@ -88,9 +86,8 @@
8886
</dependency>
8987

9088
<dependency>
91-
<groupId>com.google.inject</groupId>
92-
<artifactId>guice</artifactId>
93-
<scope>runtime</scope>
89+
<groupId>org.eclipse.sisu</groupId>
90+
<artifactId>org.eclipse.sisu.plexus</artifactId>
9491
</dependency>
9592

9693
<dependency>

0 commit comments

Comments
 (0)