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/02 19:08:32 UTC
(maven) branch MNG-8115 created (now d69f264a99)
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
at d69f264a99 [MNG-8115] Cleanup deprecated methods (junit/assertThat)
This branch includes the following new commits:
new cc3674c736 [MNG-8115] minimalMavenBuildVersion from parent (3.6.3)
new acd1e500c9 [MNG-8115] Upgrade dependencies
new d69f264a99 [MNG-8115] Cleanup deprecated methods (junit/assertThat)
The 3 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.
(maven) 03/03: [MNG-8115] Cleanup deprecated methods (junit/assertThat)
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 d69f264a9934cf35e40a299054d0b15c8eeef863
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu May 2 21:04:15 2024 +0200
[MNG-8115] Cleanup deprecated methods (junit/assertThat)
---
.../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 +-
.../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 +-
21 files changed, 28 insertions(+), 193 deletions(-)
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
index a034d65a0c..1253a222d7 100644
--- a/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/artifact/factory/DefaultArtifactFactoryTest.java
@@ -25,7 +25,7 @@ import org.codehaus.plexus.PlexusTestCase;
public class DefaultArtifactFactoryTest extends PlexusTestCase {
public void testPropagationOfSystemScopeRegardlessOfInheritedScope() throws Exception {
- ArtifactFactory factory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
+ ArtifactFactory factory = lookup(ArtifactFactory.class);
Artifact artifact = factory.createDependencyArtifact(
"test-grp", "test-artifact", VersionRange.createFromVersion("1.0"), "type", null, "system", "provided");
diff --git a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java b/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
deleted file mode 100644
index db42ecf739..0000000000
--- a/maven-compat/src/test/java/org/apache/maven/artifact/testutils/TestFileManager.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.maven.artifact.testutils;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.Assert;
-
-public class TestFileManager {
-
- public static final String TEMP_DIR_PATH = System.getProperty("java.io.tmpdir");
-
- private List<File> filesToDelete = new ArrayList<>();
-
- private final String baseFilename;
-
- private final String fileSuffix;
-
- private StackTraceElement callerInfo;
-
- private Thread cleanupWarning;
-
- private boolean warnAboutCleanup = false;
-
- public TestFileManager(String baseFilename, String fileSuffix) {
- this.baseFilename = baseFilename;
- this.fileSuffix = fileSuffix;
-
- initializeCleanupMonitoring();
- }
-
- private void initializeCleanupMonitoring() {
- callerInfo = new NullPointerException().getStackTrace()[2];
-
- Runnable warning = new Runnable() {
-
- public void run() {
- maybeWarnAboutCleanUp();
- }
- };
-
- cleanupWarning = new Thread(warning);
-
- Runtime.getRuntime().addShutdownHook(cleanupWarning);
- }
-
- private void maybeWarnAboutCleanUp() {
- if (warnAboutCleanup) {
- System.out.println("[WARNING] TestFileManager from: " + callerInfo.getClassName() + " not cleaned up!");
- }
- }
-
- public void markForDeletion(File toDelete) {
- filesToDelete.add(toDelete);
- warnAboutCleanup = true;
- }
-
- public synchronized File createTempDir() {
- try {
- Thread.sleep(20);
- } catch (InterruptedException e) {
- // ignore
- }
-
- File dir = new File(TEMP_DIR_PATH, baseFilename + System.currentTimeMillis());
-
- dir.mkdirs();
- markForDeletion(dir);
-
- return dir;
- }
-
- public synchronized File createTempFile() throws IOException {
- File tempFile = File.createTempFile(baseFilename, fileSuffix);
- tempFile.deleteOnExit();
- markForDeletion(tempFile);
-
- return tempFile;
- }
-
- public void cleanUp() throws IOException {
- for (Iterator it = filesToDelete.iterator(); it.hasNext(); ) {
- File file = (File) it.next();
-
- if (file.exists()) {
- if (file.isDirectory()) {
- FileUtils.deleteDirectory(file);
- } else {
- file.delete();
- }
- }
-
- it.remove();
- }
-
- warnAboutCleanup = false;
- }
-
- public void assertFileExistence(File dir, String filename, boolean shouldExist) {
- File file = new File(dir, filename);
-
- if (shouldExist) {
- Assert.assertTrue(file.exists());
- } else {
- Assert.assertFalse(file.exists());
- }
- }
-
- public void assertFileContents(File dir, String filename, String contentsTest, String encoding) throws IOException {
- assertFileExistence(dir, filename, true);
-
- File file = new File(dir, filename);
-
- String contents = FileUtils.fileRead(file, encoding);
-
- Assert.assertEquals(contentsTest, contents);
- }
-
- public File createFile(File dir, String filename, String contents, String encoding) throws IOException {
- File file = new File(dir, filename);
-
- file.getParentFile().mkdirs();
-
- FileUtils.fileWrite(file.getPath(), encoding, contents);
-
- markForDeletion(file);
-
- return file;
- }
-
- public String getFileContents(File file, String encoding) throws IOException {
- return FileUtils.fileRead(file, encoding);
- }
-
- protected void finalize() throws Throwable {
- maybeWarnAboutCleanUp();
-
- super.finalize();
- }
-
- public File createFile(String filename, String content, String encoding) throws IOException {
- File dir = createTempDir();
- return createFile(dir, filename, content, encoding);
- }
-}
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
index 8d5d156e26..48058fbf08 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
@@ -200,7 +200,7 @@ public class DefaultUpdateCheckManagerTest extends AbstractArtifactComponentTest
}
public void testArtifactTouchFileName() throws Exception {
- ArtifactFactory artifactFactory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
+ ArtifactFactory artifactFactory = lookup(ArtifactFactory.class);
ArtifactRepository localRepository = localRepository();
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
index c499ffe45f..a460e875bc 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
@@ -70,7 +70,7 @@ public class DefaultArtifactCollectorTest extends PlexusTestCase {
super.setUp();
source = new Source();
- artifactFactory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
+ artifactFactory = lookup(ArtifactFactory.class);
artifactCollector = lookup(LegacyArtifactCollector.class);
projectArtifact = createArtifactSpec("project", "1.0", null);
diff --git a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
index 9c6af6a6c3..2b43a58505 100644
--- a/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
+++ b/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
@@ -66,8 +66,8 @@ public abstract class AbstractConflictResolverTest extends PlexusTestCase {
protected void setUp() throws Exception {
super.setUp();
- artifactFactory = (ArtifactFactory) lookup(ArtifactFactory.ROLE);
- conflictResolver = (ConflictResolver) lookup(ConflictResolver.ROLE, roleHint);
+ artifactFactory = lookup(ArtifactFactory.class);
+ conflictResolver = lookup(ConflictResolver.class, roleHint);
a1 = createArtifact("a", "1.0");
a2 = createArtifact("a", "2.0");
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index c7b8c085e6..6437679b2d 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -91,6 +91,6 @@ public class LifecycleExecutionException extends Exception {
buffer.a(": ").failure(cause.getMessage());
}
- return buffer.toString();
+ return buffer.build();
}
}
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
index 87f4f88bc9..fa4d4890ae 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultMojoExecutionConfigurator.java
@@ -160,7 +160,7 @@ public class DefaultMojoExecutionConfigurator implements MojoExecutionConfigurat
messageBuilder.warning("'");
- logger.warn(messageBuilder.toString());
+ logger.warn(messageBuilder.build());
});
}
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
index 5544a74f34..838c9e6ea7 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/internal/DeprecatedPluginValidator.java
@@ -99,6 +99,6 @@ class DeprecatedPluginValidator extends AbstractMavenPluginDescriptorSourcedPara
.warning(mojoDescriptor.getGoal())
.warning("' is deprecated: ")
.warning(mojoDescriptor.getDeprecated())
- .toString();
+ .build();
}
}
diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
index fdfe6b6cbc..a0b0bbec5f 100644
--- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
+++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java
@@ -29,8 +29,8 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.component.annotations.Requirement;
+import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.endsWith;
-import static org.junit.Assert.assertThat;
public class ProjectDependenciesResolverTest extends AbstractCoreMavenComponentTestCase {
@Requirement
diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
index 2875142c71..ffeaede79a 100644
--- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java
@@ -23,11 +23,11 @@ import java.util.List;
import org.apache.maven.project.MavenProject;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertThat;
/**
* @author Benjamin Bentmann
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
index 9bf46efb51..1277c4eca6 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/internal/ProjectBuildListTest.java
@@ -22,10 +22,10 @@ import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.stub.ProjectDependencyGraphStub;
import org.junit.Test;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
/**
* @author Kristian Rosenvold
diff --git a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
index 7ca75728ec..fe6563c39a 100644
--- a/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java
@@ -27,8 +27,8 @@ import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.codehaus.plexus.util.FileUtils;
+import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.containsString;
-import static org.junit.Assert.assertThat;
public class DefaultMavenProjectBuilderTest extends AbstractMavenProjectTestCase {
diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
index 33540dd91a..7996d17724 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java
@@ -25,9 +25,9 @@ import java.util.Arrays;
import junit.framework.TestCase;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
/**
* Tests {@link ExtensionDescriptorBuilder}.
diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
index 28d747c10f..d3d1b4ef65 100644
--- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java
@@ -44,11 +44,11 @@ import org.eclipse.aether.internal.impl.SimpleLocalRepositoryManagerFactory;
import org.eclipse.aether.repository.LocalRepository;
import org.junit.Assert;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.startsWith;
import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertThat;
public class PomConstructionTest extends PlexusTestCase {
private static String BASE_DIR = "src/test";
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
index 2c0b7daf91..be325ba4ae 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java
@@ -38,11 +38,11 @@ import org.apache.maven.model.building.FileModelSource;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelSource;
+import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.hasKey;
import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
public class ProjectBuilderTest extends AbstractCoreMavenComponentTestCase {
@Override
diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
index e78ead9aeb..be53518412 100644
--- a/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
+++ b/maven-core/src/test/java/org/apache/maven/project/ProjectSorterTest.java
@@ -33,9 +33,9 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasItem;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
/**
* Test sorting projects by dependencies.
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
index 8a3878878b..f949c2fabd 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
@@ -565,7 +565,7 @@ public class MavenCli {
buff.strong("strong").a(' ');
buff.mojo("mojo").a(' ');
buff.project("project");
- slf4jLogger.debug(buff.toString());
+ slf4jLogger.debug(buff.build());
}
}
}
@@ -952,7 +952,7 @@ public class MavenCli {
slf4jLogger.error("After correcting the problems, you can resume the build with the command");
slf4jLogger.error(buffer().a(" ")
.strong("mvn <args> -rf " + getResumeFrom(result.getTopologicallySortedProjects(), project))
- .toString());
+ .build());
}
if (MavenExecutionRequest.REACTOR_FAIL_NEVER.equals(cliRequest.request.getReactorFailureBehavior())) {
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
index f7e2b48633..125a0511bb 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/event/ExecutionEventLogger.java
@@ -81,7 +81,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
}
private void infoMain(String msg) {
- logger.info(buffer().strong(msg).toString());
+ logger.info(buffer().strong(msg).build());
}
@Override
@@ -221,7 +221,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
} else {
buffer.success("BUILD SUCCESS");
}
- logger.info(buffer.toString());
+ logger.info(buffer.build());
}
private void logStats(MavenSession session) {
@@ -272,7 +272,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
+ chars('-', Math.max(0, LINE_LENGTH - headerLen - prefix.length() + preHeader.length()));
logger.info(
- buffer().strong(prefix).project(projectKey).strong(suffix).toString());
+ buffer().strong(prefix).project(projectKey).strong(suffix).build());
// Building Project Name Version [i/n]
String building = "Building " + event.getProject().getName() + " "
@@ -335,7 +335,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
append(buffer, event.getProject());
buffer.strong(" ---");
- logger.info(buffer.toString());
+ logger.info(buffer.build());
}
}
@@ -357,7 +357,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
append(buffer, event.getProject());
buffer.strong(" >>>");
- logger.info(buffer.toString());
+ logger.info(buffer.build());
}
}
@@ -379,7 +379,7 @@ public class ExecutionEventLogger extends AbstractExecutionListener {
append(buffer, event.getProject());
buffer.strong(" <<<");
- logger.info(buffer.toString());
+ logger.info(buffer.build());
logger.info("");
}
diff --git a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
index e8b794be3a..cfa1f32403 100644
--- a/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
+++ b/maven-embedder/src/test/java/org/apache/maven/cli/CLIManagerTest.java
@@ -23,7 +23,7 @@ import org.junit.Before;
import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.junit.Assert.assertTrue;
public class CLIManagerTest {
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
index 819cd978e9..3fb2c642bd 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/inheritance/DefaultInheritanceAssemblerTest.java
@@ -30,7 +30,8 @@ import org.apache.maven.model.io.ModelReader;
import org.apache.maven.model.io.ModelWriter;
import org.xmlunit.matchers.CompareMatcher;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.*;
+import static org.hamcrest.MatcherAssert.assertThat;
/**
* @author Hervé Boutemy
diff --git a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
index b2612e5402..73a8e52539 100644
--- a/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
+++ b/maven-model-builder/src/test/java/org/apache/maven/model/interpolation/StringSearchModelInterpolatorTest.java
@@ -34,7 +34,7 @@ import org.apache.maven.model.building.SimpleProblemCollector;
import static org.hamcrest.CoreMatchers.anyOf;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.powermock.reflect.Whitebox.getField;
import static org.powermock.reflect.Whitebox.getInternalState;
(maven) 02/03: [MNG-8115] Upgrade 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 acd1e500c9c33eb185052f4de5949e480acba69b
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Thu May 2 20:10:48 2024 +0200
[MNG-8115] Upgrade dependencies
---
pom.xml | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index d766162af3..2f909774b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,28 +126,27 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
<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) -->
- <plexusVersion>2.1.0</plexusVersion>
- <plexusInterpolationVersion>1.26</plexusInterpolationVersion>
+ <plexusVersion>2.2.0</plexusVersion>
+ <plexusInterpolationVersion>1.27</plexusInterpolationVersion>
<!-- Blocked by 3.4.0+ changes, see MNG-7710 -->
<plexusUtilsVersion>3.5.1</plexusUtilsVersion>
<guiceVersion>5.1.0</guiceVersion>
- <guavaVersion>32.0.1-jre</guavaVersion>
- <guavafailureaccessVersion>1.0.1</guavafailureaccessVersion>
+ <guavaVersion>33.2.0-jre</guavaVersion>
+ <guavafailureaccessVersion>1.0.2</guavafailureaccessVersion>
<wagonVersion>3.5.3</wagonVersion>
<securityDispatcherVersion>2.0</securityDispatcherVersion>
<cipherVersion>2.0</cipherVersion>
<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 -->
@@ -338,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>
@@ -350,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>
(maven) 01/03: [MNG-8115] minimalMavenBuildVersion from parent (3.6.3)
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 cc3674c736a0e0aa8a490c4d0acd309b336e3ed6
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Wed May 24 12:32:48 2023 +0200
[MNG-8115] minimalMavenBuildVersion from parent (3.6.3)
---
pom.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5cb163d7e4..d766162af3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,8 +125,6 @@ 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>