You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/01/19 23:36:07 UTC
[maven] branch MNG-7670 updated (48604c729 -> d1289f8f6)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-7670
in repository https://gitbox.apache.org/repos/asf/maven.git
discard 48604c729 [MNG-7670] Upgrade Commons Lang from 3.8.1 to 3.12.0 ClassWorlds from 2.6.0 to 2.7.0 Plexus Utils from 2.4.2 to 3.5.0 Hamcrest from 1.3 to 2.2 Mockito from 2.21.0 to 4.11.0 XmlUnit from 1.7.4 to 2.0.9 Guava from 30.1 to 31.1 Maven Plugin Tools Annotations from 3.7.0 to 3.7.1
new d1289f8f6 [MNG-7670] Upgrade Commons Lang from 3.8.1 to 3.12.0 ClassWorlds from 2.6.0 to 2.7.0 Plexus Utils from 2.4.2 to 3.5.0 Hamcrest from 1.3 to 2.2 Mockito from 2.21.0 to 4.11.0 XmlUnit from 1.7.4 to 2.0.9 Guava from 30.1 to 31.1 Maven Plugin Tools Annotations from 3.7.0 to 3.7.1
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (48604c729)
\
N -- N -- N refs/heads/MNG-7670 (d1289f8f6)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven] 01/01: [MNG-7670] Upgrade Commons Lang from 3.8.1 to 3.12.0 ClassWorlds from 2.6.0 to 2.7.0 Plexus Utils from 2.4.2 to 3.5.0 Hamcrest from 1.3 to 2.2 Mockito from 2.21.0 to 4.11.0 XmlUnit from 1.7.4 to 2.0.9 Guava from 30.1 to 31.1 Maven Plugin Tools Annotations from 3.7.0 to 3.7.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-7670
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d1289f8f6bebd0912cc7107dcc1edf9aa17927ae
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu Jan 19 22:55:46 2023 +0000
[MNG-7670] Upgrade Commons Lang from 3.8.1 to 3.12.0
ClassWorlds from 2.6.0 to 2.7.0
Plexus Utils from 2.4.2 to 3.5.0
Hamcrest from 1.3 to 2.2
Mockito from 2.21.0 to 4.11.0
XmlUnit from 1.7.4 to 2.0.9
Guava from 30.1 to 31.1
Maven Plugin Tools Annotations from 3.7.0 to 3.7.1
---
.../src/main/appended-resources/META-INF/NOTICE.vm | 2 +-
.../maven/toolchain/DefaultToolchainManagerTest.java | 2 +-
pom.xml | 19 ++++++++++---------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
index 37b174a2d..3926f42e7 100644
--- a/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
+++ b/apache-maven/src/main/appended-resources/META-INF/NOTICE.vm
@@ -24,7 +24,7 @@ Copyright 2006-2022 Google, Inc.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-META-INF/NOTICE in archive lib/plexus-utils-3.2.1.jar
+META-INF/NOTICE in archive lib/plexus-utils-3.5.0.jar
This product includes software developed by the Indiana University
Extreme! Lab (http://www.extreme.indiana.edu/).
This product includes software developed by
diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
index 6641bdc8a..57e6f1ef2 100644
--- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
+++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainManagerTest.java
@@ -19,7 +19,7 @@
package org.apache.maven.toolchain;
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.verify;
import static org.mockito.Mockito.when;
diff --git a/pom.xml b/pom.xml
index 2ff347dfa..251f09d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,17 +126,17 @@ under the License.
<properties>
<maven.version>3.0.5</maven.version>
<javaVersion>8</javaVersion>
- <classWorldsVersion>2.6.0</classWorldsVersion>
+ <classWorldsVersion>2.7.0</classWorldsVersion>
<commonsCliVersion>1.4</commonsCliVersion>
<commonsIoVersion>2.11.0</commonsIoVersion>
- <commonsLangVersion>3.8.1</commonsLangVersion>
+ <commonsLangVersion>3.12.0</commonsLangVersion>
<junitVersion>4.13.2</junitVersion>
- <mockitoVersion>2.21.0</mockitoVersion>
+ <mockitoVersion>4.11.0</mockitoVersion>
<plexusVersion>2.1.0</plexusVersion>
<plexusInterpolationVersion>1.26</plexusInterpolationVersion>
- <plexusUtilsVersion>3.4.2</plexusUtilsVersion>
+ <plexusUtilsVersion>3.5.0</plexusUtilsVersion>
<guiceVersion>5.1.0</guiceVersion>
- <guavaVersion>30.1-jre</guavaVersion>
+ <guavaVersion>31.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
<wagonVersion>3.5.3</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
@@ -144,8 +144,9 @@ under the License.
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.9.4</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
- <xmlunitVersion>2.2.1</xmlunitVersion>
- <powermockVersion>1.7.4</powermockVersion>
+ <xmlunitVersion>2.9.1</xmlunitVersion>
+ <powermockVersion>2.0.9</powermockVersion>
+ <maven.plugin.tools.version>3.7.1</maven.plugin.tools.version>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
<distributionId>apache-maven</distributionId>
@@ -490,13 +491,13 @@ under the License.
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
- <version>1.3</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-library</artifactId>
- <version>1.3</version>
+ <version>2.2</version>
<scope>test</scope>
</dependency>
</dependencies>