You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2022/04/15 13:26:33 UTC
[maven-release] branch MRELEASE-1084 updated: More class changes
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch MRELEASE-1084
in repository https://gitbox.apache.org/repos/asf/maven-release.git
The following commit(s) were added to refs/heads/MRELEASE-1084 by this push:
new a067c4c0 More class changes
a067c4c0 is described below
commit a067c4c04a23d2f680424be3fcc8aa6a63ff2176
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Fri Apr 15 15:26:22 2022 +0200
More class changes
---
.../maven/shared/release/PlexusJUnit4TestCase.java | 4 +++-
.../release/phase/AbstractReleaseTestCase.java | 26 +++++++++++++---------
2 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
index 9b491cc2..e1580c92 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.PlexusContainerException;
import org.codehaus.plexus.configuration.PlexusConfiguration;
@@ -86,7 +87,8 @@ public abstract class PlexusJUnit4TestCase
final String config = getCustomConfigurationName();
final ContainerConfiguration containerConfiguration =
- new DefaultContainerConfiguration().setName( "test" ).setContext( context.getContextData() ).setClassPathCaching( true );
+ new DefaultContainerConfiguration().setName( "test" ).setContext( context.getContextData() )
+ .setClassPathScanning( PlexusConstants.SCANNING_CACHE );
if ( config != null )
{
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 7a6bb629..5f03c55c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -58,12 +58,13 @@ import org.apache.maven.project.ProjectBuildingRequest.RepositoryMerging;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
import org.apache.maven.project.ProjectBuildingResult;
import org.apache.maven.project.ProjectSorter;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.apache.maven.shared.release.PlexusJUnit4TestCase;
import org.apache.maven.shared.release.config.ReleaseDescriptorBuilder;
-import org.eclipse.aether.impl.internal.SimpleLocalRepositoryManager;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.spi.localrepo.LocalRepositoryManagerFactory;
import org.xmlunit.builder.DiffBuilder;
import org.xmlunit.diff.Comparison;
import org.xmlunit.diff.ComparisonResult;
@@ -84,9 +85,11 @@ public abstract class AbstractReleaseTestCase
protected ProjectBuilder projectBuilder;
protected ArtifactRepository localRepository;
-
+
private ArtifactFactory artifactFactory;
+ private LocalRepositoryManagerFactory lrmFactory;
+
protected ReleasePhase phase;
@Override
@@ -96,11 +99,13 @@ public abstract class AbstractReleaseTestCase
super.setUp();
projectBuilder = lookup( ProjectBuilder.class );
- artifactFactory = lookup( ArtifactFactory.class );
+ artifactFactory = lookup( ArtifactFactory.class );
ArtifactRepositoryLayout layout = lookup( ArtifactRepositoryLayout.class, "default" );
String localRepoPath = getTestFile( "target/local-repository" ).getAbsolutePath().replace( '\\', '/' );
localRepository = new MavenArtifactRepository( "local", "file://" + localRepoPath, layout, null, null );
+
+ lrmFactory = lookup( LocalRepositoryManagerFactory.class, "simple" );
}
protected Path getWorkingDirectory( String workingDir )
@@ -113,7 +118,7 @@ public abstract class AbstractReleaseTestCase
{
return createReactorProjects( path, path, subpath );
}
-
+
protected ReleaseDescriptorBuilder createReleaseDescriptorBuilder( List<MavenProject> reactorProjects )
{
ReleaseDescriptorBuilder builder = new ReleaseDescriptorBuilder();
@@ -187,8 +192,9 @@ public abstract class AbstractReleaseTestCase
buildingRequest.setRemoteRepositories( repos );
buildingRequest.setPluginArtifactRepositories( repos );
buildingRequest.setRepositoryMerging( RepositoryMerging.REQUEST_DOMINANT );
- MavenRepositorySystemSession repositorySession = new MavenRepositorySystemSession();
- repositorySession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( localRepository.getBasedir() ) );
+ DefaultRepositorySystemSession repositorySession = new DefaultRepositorySystemSession();
+ repositorySession.setLocalRepositoryManager( lrmFactory.newInstance( repositorySession,
+ new LocalRepository( "target/local-repository" ) ) );
buildingRequest.setRepositorySession( repositorySession );
buildingRequest.addProfile( profile );
buildingRequest.setActiveProfileIds( Arrays.asList( profile.getId() ) );
@@ -213,7 +219,7 @@ public abstract class AbstractReleaseTestCase
for ( MavenProject project : reactorProjects )
{
MavenProject resolvedProject = projectBuilder.build( project.getFile(), buildingRequest ).getProject();
-
+
// from LifecycleDependencyResolver
if ( project.getDependencyArtifacts() == null )
{
@@ -226,7 +232,7 @@ public abstract class AbstractReleaseTestCase
throw new LifecycleExecutionException( e );
}
}
-
+
resolvedProjects.add( resolvedProject );
}
return resolvedProjects;
@@ -419,4 +425,4 @@ public abstract class AbstractReleaseTestCase
return null;
}
}
-}
\ No newline at end of file
+}