Skip to content

Commit 0c6b32f

Browse files
committed
[MJAVADOC-714] Upgrade to Maven 3.2.5
This closes #134
1 parent 506cb74 commit 0c6b32f

File tree

4 files changed

+309
-323
lines changed

4 files changed

+309
-323
lines changed

pom.xml

+24-19
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ under the License.
6767

6868
<properties>
6969
<javaVersion>8</javaVersion>
70-
<mavenVersion>3.0</mavenVersion>
70+
<mavenVersion>3.2.5</mavenVersion>
7171
<doxiaVersion>1.11.1</doxiaVersion>
7272
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
7373
<wagonVersion>2.4</wagonVersion>
74-
<sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
74+
<aetherVersion>1.0.0.v20140518</aetherVersion>
7575
<plexus-java.version>1.1.0</plexus-java.version>
7676
<jetty.version>9.4.43.v20210629</jetty.version>
7777
<!-- for ITs -->
@@ -132,33 +132,33 @@ under the License.
132132
<dependencyManagement>
133133
<dependencies>
134134
<dependency>
135-
<groupId>org.sonatype.aether</groupId>
135+
<groupId>org.eclipse.aether</groupId>
136136
<artifactId>aether-api</artifactId>
137-
<version>${sonatypeAetherVersion}</version>
137+
<version>${aetherVersion}</version>
138138
</dependency>
139139
<dependency>
140-
<groupId>org.sonatype.aether</groupId>
141-
<artifactId>aether-connector</artifactId>
142-
<version>${sonatypeAetherVersion}</version>
140+
<groupId>org.eclipse.aether</groupId>
141+
<artifactId>aether-connector-basic</artifactId>
142+
<version>${aetherVersion}</version>
143143
</dependency>
144144
<dependency>
145-
<groupId>org.sonatype.aether</groupId>
146-
<artifactId>aether-connector-wagon</artifactId>
147-
<version>${sonatypeAetherVersion}</version>
145+
<groupId>org.eclipse.aether</groupId>
146+
<artifactId>aether-transport-wagon</artifactId>
147+
<version>${aetherVersion}</version>
148148
</dependency>
149149
<dependency>
150-
<groupId>org.sonatype.aether</groupId>
150+
<groupId>org.eclipse.aether</groupId>
151151
<artifactId>aether-impl</artifactId>
152-
<version>${sonatypeAetherVersion}</version>
152+
<version>${aetherVersion}</version>
153153
</dependency>
154154
<dependency>
155-
<groupId>org.sonatype.aether</groupId>
155+
<groupId>org.eclipse.aether</groupId>
156156
<artifactId>aether-util</artifactId>
157-
<version>${sonatypeAetherVersion}</version>
157+
<version>${aetherVersion}</version>
158158
</dependency>
159159
</dependencies>
160160
</dependencyManagement>
161-
161+
162162
<dependencies>
163163
<dependency> <!-- @TODO remove!! -->
164164
<groupId>org.apache.maven</groupId>
@@ -331,7 +331,7 @@ under the License.
331331
<dependency>
332332
<groupId>org.apache.maven.plugin-testing</groupId>
333333
<artifactId>maven-plugin-testing-harness</artifactId>
334-
<version>2.1</version>
334+
<version>3.3.0</version>
335335
<scope>test</scope>
336336
</dependency>
337337
<dependency>
@@ -365,8 +365,13 @@ under the License.
365365
<scope>test</scope>
366366
</dependency>
367367
<dependency>
368-
<groupId>org.sonatype.aether</groupId>
369-
<artifactId>aether-connector-wagon</artifactId>
368+
<groupId>org.eclipse.aether</groupId>
369+
<artifactId>aether-connector-basic</artifactId>
370+
<scope>test</scope>
371+
</dependency>
372+
<dependency>
373+
<groupId>org.eclipse.aether</groupId>
374+
<artifactId>aether-transport-wagon</artifactId>
370375
<scope>test</scope>
371376
</dependency>
372377
<dependency>
@@ -468,7 +473,7 @@ under the License.
468473
<systemPropertyVariables>
469474
<maven.home>${maven.home}</maven.home>
470475
<https.protocols>${https.protocols}</https.protocols>
471-
</systemPropertyVariables>
476+
</systemPropertyVariables>
472477
<environmentVariables>
473478
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
474479
</environmentVariables>

0 commit comments

Comments
 (0)