Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-7670] Update misc dependencies (#1089) 

And do align them. Max Level is Java 8, but
we had several conflicts, like HttpClient
(used by Wagon but also by Resolver-Transport-Http).

---

https://issues.apache.org/jira/browse/MNG-7670
This commit is contained in:
Tamas Cservenak 2023-04-17 15:23:48 +02:00 committed by GitHub
parent a4b7532535
commit 924dbfecf8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maven-core/pom.xml
View File

@ -154,11 +154,6 @@ under the License.
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>

2
maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
View File

@ -37,7 +37,7 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.isA; import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;

70
pom.xml
View File

@ -124,20 +124,19 @@ under the License.
</distributionManagement> </distributionManagement>
<properties> <properties>
<maven.version>3.0.5</maven.version>
<javaVersion>8</javaVersion> <javaVersion>8</javaVersion>
<classWorldsVersion>2.6.0</classWorldsVersion> <classWorldsVersion>2.7.0</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion> <commonsCliVersion>1.5.0</commonsCliVersion>
<commonsIoVersion>2.11.0</commonsIoVersion> <commonsIoVersion>2.11.0</commonsIoVersion>
<commonsLangVersion>3.8.1</commonsLangVersion> <commonsLangVersion>3.12.0</commonsLangVersion>
<junitVersion>4.13.2</junitVersion> <junitVersion>4.13.2</junitVersion>
<mockitoVersion>2.21.0</mockitoVersion> <mockitoVersion>4.11.0</mockitoVersion>
<plexusVersion>2.1.0</plexusVersion> <plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion> <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
<!-- Blocked by 3.4.0+ changes, see MNG-7710 --> <!-- Blocked by 3.4.0+ changes, see MNG-7710 -->
<plexusUtilsVersion>3.5.1</plexusUtilsVersion> <plexusUtilsVersion>3.5.1</plexusUtilsVersion>
<guiceVersion>5.1.0</guiceVersion> <guiceVersion>5.1.0</guiceVersion>
<guavaVersion>30.1-jre</guavaVersion> <guavaVersion>31.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion> <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<wagonVersion>3.5.3</wagonVersion> <wagonVersion>3.5.3</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion> <securityDispatcherVersion>2.0</securityDispatcherVersion>
@ -145,8 +144,8 @@ under the License.
<jxpathVersion>1.3</jxpathVersion> <jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.9.8</resolverVersion> <resolverVersion>1.9.8</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion> <slf4jVersion>1.7.36</slf4jVersion>
<xmlunitVersion>2.2.1</xmlunitVersion> <xmlunitVersion>2.9.1</xmlunitVersion>
<powermockVersion>1.7.4</powermockVersion> <powermockVersion>2.0.9</powermockVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn --> <!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId> <distributionId>apache-maven</distributionId>
@ -364,7 +363,7 @@ under the License.
<dependency> <dependency>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<version>1.2.11</version> <version>1.2.12</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<!-- Wagon --> <!-- Wagon -->
@ -424,6 +423,17 @@ under the License.
<artifactId>maven-resolver-transport-wagon</artifactId> <artifactId>maven-resolver-transport-wagon</artifactId>
<version>${resolverVersion}</version> <version>${resolverVersion}</version>
</dependency> </dependency>
<!-- HttpClient: used by Wagon and Resolver-Http -->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.4.16</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<!-- Commons --> <!-- Commons -->
<dependency> <dependency>
<groupId>commons-cli</groupId> <groupId>commons-cli</groupId>
@ -476,12 +486,32 @@ under the License.
<artifactId>xmlunit-core</artifactId> <artifactId>xmlunit-core</artifactId>
<version>${xmlunitVersion}</version> <version>${xmlunitVersion}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.xmlunit</groupId> <groupId>org.xmlunit</groupId>
<artifactId>xmlunit-matchers</artifactId> <artifactId>xmlunit-matchers</artifactId>
<version>${xmlunitVersion}</version> <version>${xmlunitVersion}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
@ -490,15 +520,21 @@ under the License.
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId> <artifactId>hamcrest</artifactId>
<version>1.3</version> <version>2.2</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hamcrest</groupId> <groupId>junit</groupId>
<artifactId>hamcrest-library</artifactId> <artifactId>junit</artifactId>
<version>1.3</version> <version>${junitVersion}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<!--bootstrap-start-comment--> <!--bootstrap-start-comment-->
@ -506,10 +542,14 @@ under the License.
<!--bootstrap-end-comment--> <!--bootstrap-end-comment-->
<!--bootstrap-start-comment--> <!--bootstrap-start-comment-->
<dependencies> <dependencies>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>${junitVersion}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
</dependencies> </dependencies>