This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 3afbdb8f76 Use MavenRepositorySystem in ProjectBuildingHelper instead
of deprecated RepositorySystem (#11358)
3afbdb8f76 is described below
commit 3afbdb8f7653125c82495411f07999f7a6a2672d
Author: Slawomir Jaranowski <[email protected]>
AuthorDate: Fri Oct 31 10:35:18 2025 +0100
Use MavenRepositorySystem in ProjectBuildingHelper instead of deprecated
RepositorySystem (#11358)
* Use MavenRepositorySystem in ProjectBuildingHelper instead of deprecated
RepositorySystem
RepositorySystem has legacy implementation in maven-compat.
When plugin use a ProjectBuilder we need add a maven-compat on test
classpath.
Also, simple cleanups in tests.
---
.../org/apache/maven/project/DefaultProjectBuildingHelper.java | 4 ++--
.../org/apache/maven/AbstractCoreMavenComponentTestCase.java | 9 +++++----
.../maven/plugin/PluginParameterExpressionEvaluatorTest.java | 7 ++++---
.../test/java/org/apache/maven/project/PomConstructionTest.java | 5 +++--
.../apache/maven/project/artifact/MavenMetadataSourceTest.java | 4 ----
.../apache/maven/settings/PomConstructionWithSettingsTest.java | 6 +++---
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
index 9a9cccd7ab..7581bbdd48 100644
---
a/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
+++
b/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuildingHelper.java
@@ -32,6 +32,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.classrealm.ClassRealmManager;
import org.apache.maven.model.Build;
import org.apache.maven.model.Extension;
@@ -43,7 +44,6 @@
import org.apache.maven.plugin.PluginManagerException;
import org.apache.maven.plugin.PluginResolutionException;
import org.apache.maven.plugin.version.PluginVersionResolutionException;
-import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component;
@@ -75,7 +75,7 @@ public class DefaultProjectBuildingHelper implements
ProjectBuildingHelper {
private ProjectRealmCache projectRealmCache;
@Requirement
- private RepositorySystem repositorySystem;
+ private MavenRepositorySystem repositorySystem;
@Requirement
private MavenPluginManager pluginManager;
diff --git
a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
index 774e100cbd..669fef38cd 100644
---
a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
+++
b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.InvalidRepositoryException;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -54,13 +55,13 @@
public abstract class AbstractCoreMavenComponentTestCase extends
PlexusTestCase {
@Requirement
- protected RepositorySystem repositorySystem;
+ protected MavenRepositorySystem repositorySystem;
@Requirement
protected org.apache.maven.project.ProjectBuilder projectBuilder;
protected void setUp() throws Exception {
- repositorySystem = lookup(RepositorySystem.class);
+ repositorySystem = lookup(MavenRepositorySystem.class);
projectBuilder = lookup(org.apache.maven.project.ProjectBuilder.class);
}
@@ -198,10 +199,10 @@ protected List<ArtifactRepository>
getPluginArtifactRepositories() throws Invali
return getRemoteRepositories();
}
- protected ArtifactRepository getLocalRepository() throws
InvalidRepositoryException {
+ protected ArtifactRepository getLocalRepository() throws Exception {
File repoDir = new File(getBasedir(),
"target/local-repo").getAbsoluteFile();
- return repositorySystem.createLocalRepository(repoDir);
+ return repositorySystem.createLocalRepository(null, repoDir);
}
protected class ProjectBuilder {
diff --git
a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index 9e21f08889..bb5096d6fc 100644
---
a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++
b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -29,6 +29,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.execution.DefaultMavenExecutionRequest;
import org.apache.maven.execution.DefaultMavenExecutionResult;
import org.apache.maven.execution.MavenExecutionRequest;
@@ -52,11 +53,11 @@
public class PluginParameterExpressionEvaluatorTest extends
AbstractCoreMavenComponentTestCase {
private static final String FS = File.separator;
- private RepositorySystem factory;
+ private MavenRepositorySystem factory;
public void setUp() throws Exception {
super.setUp();
- factory = lookup(RepositorySystem.class);
+ factory = lookup(MavenRepositorySystem.class);
}
@Override
@@ -388,7 +389,7 @@ private MavenProject createDefaultProject() {
private ExpressionEvaluator createExpressionEvaluator(
MavenProject project, PluginDescriptor pluginDescriptor,
Properties executionProperties) throws Exception {
- ArtifactRepository repo = factory.createDefaultLocalRepository();
+ ArtifactRepository repo = factory.createLocalRepository(null,
RepositorySystem.defaultUserLocalRepository);
MutablePlexusContainer container = (MutablePlexusContainer)
getContainer();
MavenSession session = createSession(container, repo,
executionProperties);
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 41bba2b7a9..1008d5aee4 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
@@ -26,6 +26,7 @@
import java.util.Properties;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
@@ -59,7 +60,7 @@ public class PomConstructionTest extends PlexusTestCase {
private DefaultProjectBuilder projectBuilder;
- private RepositorySystem repositorySystem;
+ private MavenRepositorySystem repositorySystem;
private File testDirectory;
@@ -74,7 +75,7 @@ protected void setUp() throws Exception {
testDirectory = new File(getBasedir(), BASE_POM_DIR);
new File(getBasedir(), BASE_MIXIN_DIR);
projectBuilder = (DefaultProjectBuilder) lookup(ProjectBuilder.class);
- repositorySystem = lookup(RepositorySystem.class);
+ repositorySystem = lookup(MavenRepositorySystem.class);
}
@Override
diff --git
a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
index 8f37ca3210..ba9e02115f 100644
---
a/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
+++
b/maven-core/src/test/java/org/apache/maven/project/artifact/MavenMetadataSourceTest.java
@@ -18,22 +18,18 @@
*/
package org.apache.maven.project.artifact;
-import org.apache.maven.repository.RepositorySystem;
import org.codehaus.plexus.PlexusTestCase;
import org.junit.Ignore;
@Ignore
public class MavenMetadataSourceTest extends PlexusTestCase {
- private RepositorySystem repositorySystem;
protected void setUp() throws Exception {
super.setUp();
- repositorySystem = lookup(RepositorySystem.class);
}
@Override
protected void tearDown() throws Exception {
- repositorySystem = null;
super.tearDown();
}
diff --git
a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
index 96b256a655..04210b568f 100644
---
a/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
+++
b/maven-core/src/test/java/org/apache/maven/settings/PomConstructionWithSettingsTest.java
@@ -23,13 +23,13 @@
import java.io.Reader;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
+import org.apache.maven.bridge.MavenRepositorySystem;
import org.apache.maven.model.Profile;
import org.apache.maven.project.DefaultProjectBuilder;
import org.apache.maven.project.DefaultProjectBuildingRequest;
import org.apache.maven.project.ProjectBuilder;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.harness.PomTestWrapper;
-import org.apache.maven.repository.RepositorySystem;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.io.xpp3.SettingsXpp3Reader;
import org.codehaus.plexus.ContainerConfiguration;
@@ -48,7 +48,7 @@ public class PomConstructionWithSettingsTest extends
PlexusTestCase {
private DefaultProjectBuilder projectBuilder;
- private RepositorySystem repositorySystem;
+ private MavenRepositorySystem repositorySystem;
private File testDirectory;
@@ -62,7 +62,7 @@ protected void
customizeContainerConfiguration(ContainerConfiguration containerC
protected void setUp() throws Exception {
testDirectory = new File(getBasedir(), BASE_POM_DIR);
projectBuilder = (DefaultProjectBuilder) lookup(ProjectBuilder.class);
- repositorySystem = lookup(RepositorySystem.class);
+ repositorySystem = lookup(MavenRepositorySystem.class);
}
@Override
