Skip to content

Commit 05a44d8

Browse files
committed
[MRELEASE-1144] Upgrade to Parent 42 and Maven 3.6.3
This closes #216
1 parent 074fc8f commit 05a44d8

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

maven-release-api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@
5656
<artifactId>maven-scm-api</artifactId>
5757
</dependency>
5858
<dependency>
59-
<groupId>org.eclipse.aether</groupId>
60-
<artifactId>aether-api</artifactId>
59+
<groupId>org.apache.maven.resolver</groupId>
60+
<artifactId>maven-resolver-api</artifactId>
6161
</dependency>
6262
<dependency>
63-
<groupId>org.eclipse.aether</groupId>
64-
<artifactId>aether-util</artifactId>
63+
<groupId>org.apache.maven.resolver</groupId>
64+
<artifactId>maven-resolver-util</artifactId>
6565
</dependency>
6666
<dependency>
6767
<groupId>org.codehaus.plexus</groupId>

maven-release-manager/pom.xml

+15-15
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,6 @@
118118
<version>3.14.0</version>
119119
</dependency>
120120

121-
<dependency>
122-
<groupId>org.eclipse.aether</groupId>
123-
<artifactId>aether-api</artifactId>
124-
</dependency>
125-
126121
<!-- scm dependencies -->
127122
<dependency>
128123
<groupId>org.apache.maven.scm</groupId>
@@ -154,6 +149,11 @@
154149
<artifactId>jdom2</artifactId>
155150
</dependency>
156151

152+
<dependency>
153+
<groupId>org.apache.maven.resolver</groupId>
154+
<artifactId>maven-resolver-api</artifactId>
155+
<scope>test</scope>
156+
</dependency>
157157
<dependency>
158158
<groupId>junit</groupId>
159159
<artifactId>junit</artifactId>
@@ -196,28 +196,28 @@
196196
<scope>test</scope>
197197
</dependency>
198198
<dependency>
199-
<groupId>org.eclipse.aether</groupId>
200-
<artifactId>aether-util</artifactId>
199+
<groupId>org.apache.maven.resolver</groupId>
200+
<artifactId>maven-resolver-util</artifactId>
201201
<scope>test</scope>
202202
</dependency>
203203
<dependency>
204-
<groupId>org.eclipse.aether</groupId>
205-
<artifactId>aether-impl</artifactId>
204+
<groupId>org.apache.maven.resolver</groupId>
205+
<artifactId>maven-resolver-impl</artifactId>
206206
<scope>test</scope>
207207
</dependency>
208208
<dependency>
209-
<groupId>org.eclipse.aether</groupId>
210-
<artifactId>aether-connector-basic</artifactId>
209+
<groupId>org.apache.maven.resolver</groupId>
210+
<artifactId>maven-resolver-connector-basic</artifactId>
211211
<scope>test</scope>
212212
</dependency>
213213
<dependency>
214-
<groupId>org.eclipse.aether</groupId>
215-
<artifactId>aether-transport-file</artifactId>
214+
<groupId>org.apache.maven.resolver</groupId>
215+
<artifactId>maven-resolver-transport-file</artifactId>
216216
<scope>test</scope>
217217
</dependency>
218218
<dependency>
219-
<groupId>org.eclipse.aether</groupId>
220-
<artifactId>aether-transport-wagon</artifactId>
219+
<groupId>org.apache.maven.resolver</groupId>
220+
<artifactId>maven-resolver-transport-wagon</artifactId>
221221
<scope>test</scope>
222222
</dependency>
223223
<dependency>

pom.xml

+18-18
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<groupId>org.apache.maven</groupId>
2525
<artifactId>maven-parent</artifactId>
26-
<version>41</version>
26+
<version>42</version>
2727
<relativePath />
2828
</parent>
2929

@@ -70,7 +70,7 @@
7070
<scm>
7171
<connection>scm:git:https://gitbox.apache.org/repos/asf/maven-release.git</connection>
7272
<developerConnection>scm:git:https://gitbox.apache.org/repos/asf/maven-release.git</developerConnection>
73-
<tag>maven-release-3.0.0-M7</tag>
73+
<tag>HEAD</tag>
7474
<url>https://github.com/apache/maven-release/tree/${project.scm.tag}</url>
7575
</scm>
7676
<issueManagement>
@@ -90,8 +90,8 @@
9090

9191
<properties>
9292
<scmVersion>2.0.1</scmVersion>
93-
<mavenVersion>3.2.5</mavenVersion>
94-
<resolverVersion>1.0.0.v20140518</resolverVersion>
93+
<mavenVersion>3.6.3</mavenVersion>
94+
<resolverVersion>1.4.1</resolverVersion>
9595
<wagonVersion>3.5.3</wagonVersion>
9696
<slf4jVersion>1.7.36</slf4jVersion>
9797
<junitVersion>4.13.2</junitVersion>
@@ -163,43 +163,43 @@
163163
</dependency>
164164

165165
<dependency>
166-
<groupId>org.eclipse.aether</groupId>
167-
<artifactId>aether-api</artifactId>
166+
<groupId>org.apache.maven.resolver</groupId>
167+
<artifactId>maven-resolver-api</artifactId>
168168
<version>${resolverVersion}</version>
169169
</dependency>
170170
<dependency>
171-
<groupId>org.eclipse.aether</groupId>
172-
<artifactId>aether-util</artifactId>
171+
<groupId>org.apache.maven.resolver</groupId>
172+
<artifactId>maven-resolver-util</artifactId>
173173
<version>${resolverVersion}</version>
174174
</dependency>
175175

176176
<dependency>
177-
<groupId>org.eclipse.aether</groupId>
178-
<artifactId>aether-spi</artifactId>
177+
<groupId>org.apache.maven.resolver</groupId>
178+
<artifactId>maven-resolver-spi</artifactId>
179179
<version>${resolverVersion}</version>
180180
<scope>test</scope>
181181
</dependency>
182182
<dependency>
183-
<groupId>org.eclipse.aether</groupId>
184-
<artifactId>aether-impl</artifactId>
183+
<groupId>org.apache.maven.resolver</groupId>
184+
<artifactId>maven-resolver-impl</artifactId>
185185
<version>${resolverVersion}</version>
186186
<scope>test</scope>
187187
</dependency>
188188
<dependency>
189-
<groupId>org.eclipse.aether</groupId>
190-
<artifactId>aether-connector-basic</artifactId>
189+
<groupId>org.apache.maven.resolver</groupId>
190+
<artifactId>maven-resolver-connector-basic</artifactId>
191191
<version>${resolverVersion}</version>
192192
<scope>test</scope>
193193
</dependency>
194194
<dependency>
195-
<groupId>org.eclipse.aether</groupId>
196-
<artifactId>aether-transport-file</artifactId>
195+
<groupId>org.apache.maven.resolver</groupId>
196+
<artifactId>maven-resolver-transport-file</artifactId>
197197
<version>${resolverVersion}</version>
198198
<scope>test</scope>
199199
</dependency>
200200
<dependency>
201-
<groupId>org.eclipse.aether</groupId>
202-
<artifactId>aether-transport-wagon</artifactId>
201+
<groupId>org.apache.maven.resolver</groupId>
202+
<artifactId>maven-resolver-transport-wagon</artifactId>
203203
<version>${resolverVersion}</version>
204204
<scope>test</scope>
205205
</dependency>

0 commit comments

Comments
 (0)