You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2020/03/09 18:10:39 UTC
[maven] 02/05: Refactor getLocalRepository() in tests by using the
repositorySystem
This is an automated email from the ASF dual-hosted git repository.
khmarbaise pushed a commit to branch MNG-6866
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 782e8f81a54e3c8a1e0a397979828fa94eabf4d7
Author: rfscholte <rf...@apache.org>
AuthorDate: Sat Feb 29 21:01:24 2020 +0100
Refactor getLocalRepository() in tests by using the repositorySystem
---
.../org/apache/maven/project/AbstractMavenProjectTestCase.java | 7 +------
.../org/apache/maven/project/DefaultMavenProjectBuilderTest.java | 6 +-----
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 9f836c2..ac3954d 100644
--- a/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -23,7 +23,6 @@ import java.net.URL;
import java.util.Arrays;
import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.model.building.ModelBuildingException;
import org.apache.maven.model.building.ModelProblem;
import org.apache.maven.repository.RepositorySystem;
@@ -119,11 +118,7 @@ public abstract class AbstractMavenProjectTestCase
protected ArtifactRepository getLocalRepository()
throws Exception
{
- ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "legacy" );
-
- ArtifactRepository r = repositorySystem.createArtifactRepository( "local", "file://" + getLocalRepositoryPath().getAbsolutePath(), repoLayout, null, null );
-
- return r;
+ return repositorySystem.createLocalRepository( getLocalRepositoryPath() );
}
// ----------------------------------------------------------------------
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 008c6d3..b2e314f 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
@@ -198,11 +198,7 @@ public class DefaultMavenProjectBuilderTest
protected ArtifactRepository getLocalRepository()
throws Exception
{
- ArtifactRepositoryLayout repoLayout = lookup( ArtifactRepositoryLayout.class, "default" );
- ArtifactRepository r =
- repositorySystem.createArtifactRepository( "local", "file://" + localRepoDir.getAbsolutePath(), repoLayout,
- null, null );
- return r;
+ return repositorySystem.createLocalRepository( getLocalRepositoryPath() );
}
public void xtestLoop()