Skip to content

Commit

Permalink
[MJAVADOC-714] Upgrade to Maven 3.2.5
Browse files Browse the repository at this point in the history
This closes #134
  • Loading branch information
michael-o committed Apr 16, 2022
1 parent 506cb74 commit 0c6b32f
Show file tree
Hide file tree
Showing 4 changed files with 309 additions and 323 deletions.
43 changes: 24 additions & 19 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,11 @@ under the License.

<properties>
<javaVersion>8</javaVersion>
<mavenVersion>3.0</mavenVersion>
<mavenVersion>3.2.5</mavenVersion>
<doxiaVersion>1.11.1</doxiaVersion>
<doxia-sitetoolsVersion>1.11.1</doxia-sitetoolsVersion>
<wagonVersion>2.4</wagonVersion>
<sonatypeAetherVersion>1.13.1</sonatypeAetherVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
<plexus-java.version>1.1.0</plexus-java.version>
<jetty.version>9.4.43.v20210629</jetty.version>
<!-- for ITs -->
Expand Down Expand Up @@ -132,33 +132,33 @@ under the License.
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${sonatypeAetherVersion}</version>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector</artifactId>
<version>${sonatypeAetherVersion}</version>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>${sonatypeAetherVersion}</version>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${sonatypeAetherVersion}</version>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${sonatypeAetherVersion}</version>
<version>${aetherVersion}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency> <!-- @TODO remove!! -->
<groupId>org.apache.maven</groupId>
Expand Down Expand Up @@ -331,7 +331,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
<version>2.1</version>
<version>3.3.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -365,8 +365,13 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-connector-basic</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.aether</groupId>
<artifactId>aether-transport-wagon</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -468,7 +473,7 @@ under the License.
<systemPropertyVariables>
<maven.home>${maven.home}</maven.home>
<https.protocols>${https.protocols}</https.protocols>
</systemPropertyVariables>
</systemPropertyVariables>
<environmentVariables>
<JENKINS_MAVEN_AGENT_DISABLED>true</JENKINS_MAVEN_AGENT_DISABLED>
</environmentVariables>
Expand Down
Loading

0 comments on commit 0c6b32f

Please sign in to comment.