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 2024/05/03 20:33:08 UTC
(maven) branch MNG-8115 updated (8c8e249036 -> 8e0b30fad8)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MNG-8115
in repository https://gitbox.apache.org/repos/asf/maven.git
omit 8c8e249036 [MNG-8115] Upgrade Guice to 6.0.0
omit 4550d03795 [MNG-8115] Use property from parent
omit e04024f65f [MNG-8115] Upgrade Plexus Utils to 4.x/Plexus Xml 3.x
omit d69f264a99 [MNG-8115] Cleanup deprecated methods (junit/assertThat)
omit acd1e500c9 [MNG-8115] Upgrade dependencies
omit cc3674c736 [MNG-8115] minimalMavenBuildVersion from parent (3.6.3)
new 8e0b30fad8 [MNG-8115] Upgrade minimal set of dependencies
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 (8c8e249036)
\
N -- N -- N refs/heads/MNG-8115 (8e0b30fad8)
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:
.../factory/DefaultArtifactFactoryTest.java | 2 +-
.../maven/artifact/testutils/TestFileManager.java | 166 +++++++++++++++++++++
.../legacy/DefaultUpdateCheckManagerTest.java | 2 +-
.../resolver/DefaultArtifactCollectorTest.java | 2 +-
.../conflict/AbstractConflictResolverTest.java | 4 +-
.../lifecycle/LifecycleExecutionException.java | 2 +-
.../internal/DefaultMojoExecutionConfigurator.java | 2 +-
.../plugin/internal/DeprecatedPluginValidator.java | 2 +-
.../maven/ProjectDependenciesResolverTest.java | 2 +-
.../maven/execution/DefaultMavenExecutionTest.java | 2 +-
.../lifecycle/internal/ProjectBuildListTest.java | 2 +-
.../project/DefaultMavenProjectBuilderTest.java | 2 +-
.../project/ExtensionDescriptorBuilderTest.java | 2 +-
.../apache/maven/project/PomConstructionTest.java | 2 +-
.../apache/maven/project/ProjectBuilderTest.java | 2 +-
.../apache/maven/project/ProjectSorterTest.java | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../project-with-inheritance/pom.xml | 2 +-
.../resources/org/apache/maven/lifecycle/pom.xml | 2 +-
.../main/java/org/apache/maven/cli/MavenCli.java | 4 +-
.../maven/cli/event/ExecutionEventLogger.java | 12 +-
.../java/org/apache/maven/cli/CLIManagerTest.java | 2 +-
.../DefaultInheritanceAssemblerTest.java | 3 +-
.../StringSearchModelInterpolatorTest.java | 2 +-
maven-model/pom.xml | 4 -
maven-repository-metadata/pom.xml | 4 -
maven-settings/pom.xml | 4 -
pom.xml | 17 ++-
28 files changed, 209 insertions(+), 47 deletions(-)
create mode 100644 maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
(maven) 01/01: [MNG-8115] Upgrade minimal set of dependencies
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MNG-8115
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 8e0b30fad8e1b0ba018d3143f102a4e756d08420
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Fri May 3 22:32:23 2024 +0200
[MNG-8115] Upgrade minimal set of dependencies
---
pom.xml | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5cb163d7e4..39a4908f48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,21 +125,18 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <minimalMavenBuildVersion>3.5.4</minimalMavenBuildVersion>
-
- <sisuVersion>0.9.0.M2</sisuVersion>
- <classWorldsVersion>2.7.0</classWorldsVersion>
- <commonsCliVersion>1.5.0</commonsCliVersion>
- <commonsIoVersion>2.11.0</commonsIoVersion>
- <commonsLangVersion>3.12.0</commonsLangVersion>
+ <classWorldsVersion>2.8.0</classWorldsVersion>
+ <commonsCliVersion>1.7.0</commonsCliVersion>
+ <commonsIoVersion>2.16.1</commonsIoVersion>
+ <commonsLangVersion>3.14.0</commonsLangVersion>
<junitVersion>4.13.2</junitVersion>
<hamcrestVersion>2.2</hamcrestVersion>
<mockitoVersion>4.11.0</mockitoVersion>
- <!-- plexus 2.1.1 is broken, no new release exists yet (nor will exist) -->
+ <!-- plexus 2.1.1 is broken -->
<plexusVersion>2.1.0</plexusVersion>
- <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
- <!-- Blocked by 3.4.0+ changes, see MNG-7710 -->
- <plexusUtilsVersion>3.5.1</plexusUtilsVersion>
+ <plexusInterpolationVersion>1.27</plexusInterpolationVersion>
+ <!-- Blocked by 3.4.0+ changes, see MNG-7710, downgrade from parent 4.0.1 -->
+ <version.plexus-utils>3.5.1</version.plexus-utils>
<guiceVersion>5.1.0</guiceVersion>
<guavaVersion>32.0.1-jre</guavaVersion>
<guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
@@ -149,7 +146,7 @@ under the License.
<jxpathVersion>1.3</jxpathVersion>
<resolverVersion>1.9.20</resolverVersion>
<slf4jVersion>1.7.36</slf4jVersion>
- <xmlunitVersion>2.9.1</xmlunitVersion>
+ <xmlunitVersion>2.10.0</xmlunitVersion>
<powermockVersion>2.0.9</powermockVersion>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<!-- Control the name of the distribution and information output by mvn -->
@@ -238,7 +235,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>${plexusUtilsVersion}</version>
+ <version>${version.plexus-utils}</version>
</dependency>
<dependency>
<groupId>com.google.inject</groupId>
@@ -292,7 +289,7 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version>${sisuVersion}</version>
+ <version>${version.sisu-maven-plugin}</version>
<exclusions>
<exclusion>
<!-- Way too easy to conflict with plugins to be in Maven and leak in plugins -->
@@ -304,7 +301,7 @@ under the License.
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
- <version>${sisuVersion}</version>
+ <version>${version.sisu-maven-plugin}</version>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -340,7 +337,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>3.3.4</version>
+ <version>3.4.2</version>
<exclusions>
<!-- We use org.apache.maven.shared.utils.logging only in Maven Core -->
<exclusion>
@@ -352,7 +349,7 @@ under the License.
<dependency>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi</artifactId>
- <version>2.4.0</version>
+ <version>2.4.1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>