You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by el...@apache.org on 2020/07/27 16:10:56 UTC
[maven-dependency-plugin] branch master updated: [MDEP-717] Upgrade
to 3.1.1 (#78)
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 50568fc [MDEP-717] Upgrade to 3.1.1 (#78)
50568fc is described below
commit 50568fc4f34b42451456bed33c47816399169b09
Author: Elliotte Rusty Harold <el...@users.noreply.github.com>
AuthorDate: Mon Jul 27 16:10:47 2020 +0000
[MDEP-717] Upgrade to 3.1.1 (#78)
* use Maven 3.1.1
---
pom.xml | 48 ++++++++++++---------
.../fromDependencies/BuildClasspathMojo.java | 4 +-
.../dependency/AbstractDependencyMojoTestCase.java | 19 ++++++++
.../maven/plugins/dependency/TestGetMojo.java | 21 ++++-----
.../plugins/dependency/TestListClassesMojo.java | 11 ++---
.../dependency/fromConfiguration/TestCopyMojo.java | 20 +++------
.../TestIncludeExcludeUnpackMojo.java | 11 +++--
.../fromConfiguration/TestUnpackMojo.java | 13 ++----
.../fromDependencies/TestBuildClasspathMojo.java | 50 ++++++++++------------
.../fromDependencies/TestCopyDependenciesMojo.java | 9 ++--
.../TestCopyDependenciesMojo2.java | 46 ++++++++++----------
.../TestUnpackDependenciesMojo.java | 10 ++---
.../translators/TestClassifierTypeTranslator.java | 8 ++--
13 files changed, 133 insertions(+), 137 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2effeb..13cbf09 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@ under the License.
</contributors>
<properties>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.1</mavenVersion>
<doxiaVersion>1.9.1</doxiaVersion>
<doxiaSiteVersion>1.9.2</doxiaSiteVersion>
<jettyVersion>9.2.28.v20190418</jettyVersion>
- <pluginTestingVersion>2.1</pluginTestingVersion>
+ <pluginTestingVersion>3.1.0</pluginTestingVersion>
<javaVersion>7</javaVersion>
<project.build.outputTimestamp>2020-03-07T11:40:47Z</project.build.outputTimestamp>
</properties>
@@ -113,12 +113,6 @@ under the License.
<!-- Remove once deprecated code has been replaced/removed -->
<dependency>
<groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>${mavenVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>${mavenVersion}</version>
</dependency>
@@ -268,6 +262,19 @@ under the License.
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.eclipse.aether</groupId>
+ <artifactId>aether-connector-wagon</artifactId>
+ <version>0.9.0.M2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-lightweight</artifactId>
+ <version>3.4.0</version>
+ <scope>provided</scope>
+ </dependency>
<!-- test -->
<dependency>
@@ -295,24 +302,23 @@ under the License.
<scope>test</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-interpolation</artifactId>
<version>1.26</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.sonatype.aether</groupId>
- <artifactId>aether-connector-wagon</artifactId>
- <version>1.7</version>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
- <version>3.4.0</version>
- <scope>provided</scope>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -391,7 +397,7 @@ under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- Need of more heap space in order to run the unit tests !-->
+ <!-- Need more heap space in order to run the unit tests !-->
<argLine>-Xmx384m</argLine>
<systemPropertyVariables>
<maven.home>${maven.home}</maven.home>
diff --git a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
index d055ad8..223e725 100644
--- a/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
+++ b/src/main/java/org/apache/maven/plugins/dependency/fromDependencies/BuildClasspathMojo.java
@@ -43,6 +43,7 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProjectHelper;
+import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.apache.maven.shared.transfer.repository.RepositoryManager;
import org.codehaus.plexus.util.StringUtils;
@@ -280,7 +281,8 @@ public class BuildClasspathMojo
// substitute the property for the local repo path to make the classpath file portable.
if ( StringUtils.isNotEmpty( localRepoProperty ) )
{
- File localBasedir = repositoryManager.getLocalRepositoryBasedir( session.getProjectBuildingRequest() );
+ ProjectBuildingRequest projectBuildingRequest = session.getProjectBuildingRequest();
+ File localBasedir = repositoryManager.getLocalRepositoryBasedir( projectBuildingRequest );
file = StringUtils.replace( file, localBasedir.getAbsolutePath(), localRepoProperty );
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
index e802f9d..c985594 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/AbstractDependencyMojoTestCase.java
@@ -23,8 +23,14 @@ import java.io.File;
import java.io.IOException;
import org.apache.commons.io.FileUtils;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
+import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.LocalRepositoryManager;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
public abstract class AbstractDependencyMojoTestCase
@@ -76,4 +82,17 @@ public abstract class AbstractDependencyMojoTestCase
{
mojo.copyFile( artifact, destFile );
}
+
+
+ protected void installLocalRepository( LegacySupport legacySupport )
+ throws ComponentLookupException
+ {
+ DefaultRepositorySystemSession repoSession =
+ (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
+ RepositorySystem system = lookup( RepositorySystem.class );
+ String directory = stubFactory.getWorkingDir().toString();
+ LocalRepository localRepository = new LocalRepository( directory );
+ LocalRepositoryManager manager = system.newLocalRepositoryManager( repoSession, localRepository );
+ repoSession.setLocalRepositoryManager( manager );
+ }
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
index b602435..ee23525 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -41,13 +41,11 @@ import org.eclipse.jetty.security.authentication.BasicAuthenticator;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ResourceHandler;
import org.eclipse.jetty.util.security.Constraint;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestGetMojo
extends AbstractDependencyMojoTestCase
{
- GetMojo mojo;
+ private GetMojo mojo;
protected void setUp()
throws Exception
@@ -56,24 +54,22 @@ public class TestGetMojo
super.setUp( "markers", false );
File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
- assert testPom.exists();
mojo = (GetMojo) lookupMojo( "get", testPom );
assertNotNull( mojo );
LegacySupport legacySupport = lookup( LegacySupport.class );
- MavenSession session = newMavenSession( new MavenProjectStub() );
- Settings settings = session.getSettings();
+ MavenSession mavenSession = newMavenSession( new MavenProjectStub() );
+ Settings settings = mavenSession.getSettings();
Server server = new Server();
server.setId( "myserver" );
server.setUsername( "foo" );
server.setPassword( "bar" );
settings.addServer( server );
- legacySupport.setSession( session );
- DefaultRepositorySystemSession repoSession =
- (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
-
+ legacySupport.setSession( mavenSession );
+
+ installLocalRepository( legacySupport );
+
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
}
@@ -150,9 +146,8 @@ public class TestGetMojo
public void testParseRepository()
throws Exception
{
- ArtifactRepository repo;
ArtifactRepositoryPolicy policy = null;
- repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
+ ArtifactRepository repo = mojo.parseRepository( "central::default::https://repo.maven.apache.org/maven2", policy );
assertEquals( "central", repo.getId() );
assertEquals( DefaultRepositoryLayout.class, repo.getLayout().getClass() );
assertEquals( "https://repo.maven.apache.org/maven2", repo.getUrl() );
diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
index a46e55b..df990fe 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
@@ -24,8 +24,6 @@ import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
import java.io.File;
@@ -37,10 +35,10 @@ public class TestListClassesMojo
protected void setUp()
throws Exception
{
- // required for mojo lookups to work
super.setUp( "markers", false );
-
File testPom = new File( getBasedir(), "target/test-classes/unit/get-test/plugin-config.xml" );
+
+ assertTrue( testPom.exists() );
mojo = (ListClassesMojo) lookupMojo( "list-classes", testPom );
assertNotNull( mojo );
@@ -54,9 +52,8 @@ public class TestListClassesMojo
server.setPassword( "bar" );
settings.addServer( server );
legacySupport.setSession( session );
- DefaultRepositorySystemSession repoSession =
- (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+
+ installLocalRepository( legacySupport );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
index 19dbcd4..52fa4e9 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestCopyMojo.java
@@ -29,22 +29,16 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestCopyMojo
extends AbstractDependencyMojoTestCase
{
- CopyMojo mojo;
-
- public TestCopyMojo()
- {
- super();
- }
+ private CopyMojo mojo;
protected void setUp()
throws Exception
@@ -58,18 +52,16 @@ public class TestCopyMojo
assertNotNull( mojo );
assertNotNull( mojo.getProject() );
- // MavenProject project = mojo.getProject();
- // init classifier things
MavenSession session = newMavenSession( mojo.getProject() );
setVariableValueToObject( mojo, "session", session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
-
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ LegacySupport legacySupport = lookup( LegacySupport.class );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
}
- public ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
+ private ArtifactItem getSingleArtifactItem( boolean removeVersion, boolean useBaseVersion )
throws MojoExecutionException
{
List<ArtifactItem> list =
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
index 54fa28d..afc0dfc 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestIncludeExcludeUnpackMojo.java
@@ -26,12 +26,11 @@ import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.codehaus.plexus.archiver.manager.ArchiverManager;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestIncludeExcludeUnpackMojo
extends AbstractDependencyMojoTestCase
@@ -44,7 +43,7 @@ public class TestIncludeExcludeUnpackMojo
private final String PACKED_FILE_PATH = "target/test-classes/unit/unpack-dependencies-test/" + PACKED_FILE;
- UnpackMojo mojo;
+ private UnpackMojo mojo;
protected void setUp()
throws Exception
@@ -77,9 +76,9 @@ public class TestIncludeExcludeUnpackMojo
MavenSession session = newMavenSession( mojo.getProject() );
setVariableValueToObject( mojo, "session", session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
-
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ LegacySupport legacySupport = lookup( LegacySupport.class );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
}
protected void tearDown()
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
index 91b0640..79a96bf 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromConfiguration/TestUnpackMojo.java
@@ -23,13 +23,12 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugins.dependency.utils.markers.UnpackFileMarkerHandler;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
import java.io.File;
import java.io.IOException;
@@ -45,11 +44,6 @@ public class TestUnpackMojo
UnpackMojo mojo;
- public TestUnpackMojo()
- {
- super();
- }
-
protected void setUp()
throws Exception
{
@@ -77,9 +71,10 @@ public class TestUnpackMojo
MavenSession session = newMavenSession( mojo.getProject() );
setVariableValueToObject( mojo, "session", session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
+ LegacySupport legacySupport = lookup( LegacySupport.class );
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
}
public ArtifactItem getSingleArtifactItem( boolean removeVersion )
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
index 25a9fcd..cb66f31 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestBuildClasspathMojo.java
@@ -24,36 +24,36 @@ import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestBuildClasspathMojo
extends AbstractDependencyMojoTestCase
{
+
+ private BuildClasspathMojo mojo;
protected void setUp()
throws Exception
{
// required for mojo lookups to work
super.setUp( "build-classpath", true );
+
+ File testPom = new File( getBasedir(), "target/test-classes/unit/build-classpath-test/plugin-config.xml" );
+ mojo = (BuildClasspathMojo) lookupMojo( "build-classpath", testPom );
+
+ assertNotNull( mojo );
+ assertNotNull( mojo.getProject() );
}
/**
- * tests the proper discovery and configuration of the mojo
- *
- * @throws Exception in case of an error.
+ * Tests the proper discovery and configuration of the mojo.
*/
public void testEnvironment()
throws Exception
{
- File testPom = new File( getBasedir(), "target/test-classes/unit/build-classpath-test/plugin-config.xml" );
- BuildClasspathMojo mojo = (BuildClasspathMojo) lookupMojo( "build-classpath", testPom );
-
- assertNotNull( mojo );
- assertNotNull( mojo.getProject() );
MavenProject project = mojo.getProject();
// mojo.silent = true;
@@ -65,7 +65,6 @@ public class TestBuildClasspathMojo
project.setDependencyArtifacts( directArtifacts );
mojo.execute();
- String file;
try
{
mojo.readClasspathFile();
@@ -80,7 +79,7 @@ public class TestBuildClasspathMojo
mojo.setOutputFile( new File( testDir, "buildClasspath.txt" ) );
mojo.execute();
- file = mojo.readClasspathFile();
+ String file = mojo.readClasspathFile();
assertNotNull( file );
assertTrue( file.length() > 0 );
@@ -115,18 +114,13 @@ public class TestBuildClasspathMojo
public void testPath()
throws Exception
{
- File testPom = new File( getBasedir(), "target/test-classes/unit/build-classpath-test/plugin-config.xml" );
- BuildClasspathMojo mojo = (BuildClasspathMojo) lookupMojo( "build-classpath", testPom );
-
- assertNotNull( mojo );
- assertNotNull( mojo.getProject() );
-
MavenSession session = newMavenSession( mojo.getProject() );
setVariableValueToObject( mojo, "session", session );
-
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
-
+
+ LegacySupport legacySupport = lookup( LegacySupport.class );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
+
Artifact artifact = stubFactory.getReleaseArtifact();
StringBuilder sb = new StringBuilder();
@@ -136,17 +130,17 @@ public class TestBuildClasspathMojo
assertEquals( artifact.getFile().getPath(), sb.toString() );
mojo.setLocalRepoProperty( "$M2_REPO" );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.appendArtifactPath( artifact, sb );
assertEquals( "$M2_REPO" + File.separator + artifact.getFile().getName(), sb.toString() );
mojo.setLocalRepoProperty( "%M2_REPO%" );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.appendArtifactPath( artifact, sb );
assertEquals( "%M2_REPO%" + File.separator + artifact.getFile().getName(), sb.toString() );
mojo.setLocalRepoProperty( "%M2_REPO%" );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.setPrependGroupId( true );
mojo.appendArtifactPath( artifact, sb );
assertEquals( "If prefix is null, prependGroupId has no impact ",
@@ -155,7 +149,7 @@ public class TestBuildClasspathMojo
mojo.setLocalRepoProperty( "" );
mojo.setPrefix( "prefix" );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.setPrependGroupId( true );
mojo.appendArtifactPath( artifact, sb );
assertEquals( "prefix" + File.separator + DependencyUtil.getFormattedFileName( artifact, false, true ),
@@ -164,13 +158,13 @@ public class TestBuildClasspathMojo
mojo.setLocalRepoProperty( "" );
mojo.setPrefix( "prefix" );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.appendArtifactPath( artifact, sb );
assertEquals( "prefix" + File.separator + artifact.getFile().getName(), sb.toString() );
mojo.setPrefix( "prefix" );
mojo.setStripVersion( true );
- sb.setLength( 0 );
+ sb = new StringBuilder();
mojo.appendArtifactPath( artifact, sb );
assertEquals( "prefix" + File.separator + DependencyUtil.getFormattedFileName( artifact, true ),
sb.toString() );
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
index 6d588a2..2f65c85 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo.java
@@ -28,6 +28,7 @@ import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
@@ -35,8 +36,6 @@ import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestCopyDependenciesMojo
extends AbstractDependencyMojoTestCase
@@ -63,9 +62,9 @@ public class TestCopyDependenciesMojo
MavenSession session = newMavenSession( project );
setVariableValueToObject( mojo, "session", session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
-
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ LegacySupport legacySupport = lookup( LegacySupport.class );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
index bcedc16..96afe1c 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestCopyDependenciesMojo2.java
@@ -21,6 +21,9 @@ package org.apache.maven.plugins.dependency.fromDependencies;
import java.io.File;
import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -31,6 +34,7 @@ import org.apache.maven.artifact.metadata.ArtifactMetadata;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
import org.apache.maven.artifact.repository.MavenArtifactRepository;
+import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.Snapshot;
@@ -39,20 +43,16 @@ import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.utils.DependencyUtil;
-import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestCopyDependenciesMojo2
extends AbstractDependencyMojoTestCase
{
- CopyDependenciesMojo mojo;
+ private CopyDependenciesMojo mojo;
protected void setUp()
throws Exception
@@ -82,23 +82,7 @@ public class TestCopyDependenciesMojo2
setVariableValueToObject( mojo, "session", session );
legacySupport.setSession( session );
- DefaultRepositorySystemSession repoSession =
- (DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
- }
-
- public void assertNoMarkerFile( Artifact artifact )
- {
- DefaultFileMarkerHandler handle = new DefaultFileMarkerHandler( artifact, mojo.markersDirectory );
- try
- {
- assertFalse( handle.isMarkerSet() );
- }
- catch ( MojoExecutionException e )
- {
- fail( e.getLongMessage() );
- }
-
+ installLocalRepository( legacySupport );
}
public void testCopyDependenciesMojoIncludeCompileScope()
@@ -292,6 +276,9 @@ public class TestCopyDependenciesMojo2
new ArtifactRepositoryPolicy() );
Set<Artifact> artifacts = mojo.getProject().getArtifacts();
+ File baseDirectory = Paths.get( targetRepository.getBasedir() ).toFile();
+ assertTrue( baseDirectory.isDirectory() );
+
for ( Artifact artifact : artifacts )
{
assertArtifactExists( artifact, targetRepository );
@@ -328,7 +315,18 @@ public class TestCopyDependenciesMojo2
private void assertArtifactExists( Artifact artifact, ArtifactRepository targetRepository )
{
- File file = new File( targetRepository.getBasedir(), targetRepository.getLayout().pathOf( artifact ) );
+
+ ArtifactRepositoryLayout layout = targetRepository.getLayout();
+ String pathOf = layout.pathOf( artifact );
+
+ // possible change/bug in DefaultArtifactRepositoryLayout.pathOf method between Maven 3 and Maven 3.1
+ pathOf = pathOf.replace( "20130710.122148-1", "SNAPSHOT" );
+
+ File file = new File( targetRepository.getBasedir(), pathOf );
+
+ Path targetPath = Paths.get( file.getParent() );
+ assertTrue( "Target path doesn't exist: " + targetPath, Files.isDirectory( targetPath ) );
+
assertTrue( "File doesn't exist: " + file.getAbsolutePath(), file.exists() );
Collection<ArtifactMetadata> metas = artifact.getMetadataList();
@@ -336,7 +334,7 @@ public class TestCopyDependenciesMojo2
{
File metaFile =
new File( targetRepository.getBasedir(),
- targetRepository.getLayout().pathOfLocalRepositoryMetadata( meta, targetRepository ) );
+ layout.pathOfLocalRepositoryMetadata( meta, targetRepository ) );
assertTrue( metaFile.exists() );
}
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
index 1f81f76..2406071 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/fromDependencies/TestUnpackDependenciesMojo.java
@@ -30,6 +30,7 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
@@ -38,8 +39,6 @@ import org.apache.maven.plugins.dependency.utils.DependencyUtil;
import org.apache.maven.plugins.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
public class TestUnpackDependenciesMojo
extends AbstractDependencyMojoTestCase
@@ -76,9 +75,10 @@ public class TestUnpackDependenciesMojo
MavenSession session = newMavenSession( project );
setVariableValueToObject( mojo, "session", session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
-
+ LegacySupport legacySupport = lookup( LegacySupport.class );
+ legacySupport.setSession( session );
+ installLocalRepository( legacySupport );
+
Set<Artifact> artifacts = this.stubFactory.getScopedArtifacts();
Set<Artifact> directArtifacts = this.stubFactory.getReleaseAndSnapshotArtifacts();
artifacts.addAll( directArtifacts );
diff --git a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
index 5e77698..1bbf0db 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/utils/translators/TestClassifierTypeTranslator.java
@@ -31,6 +31,7 @@ import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
import org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.execution.MavenSession;
+import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
@@ -38,8 +39,6 @@ import org.apache.maven.plugin.testing.stubs.StubArtifactRepository;
import org.apache.maven.plugins.dependency.AbstractDependencyMojoTestCase;
import org.apache.maven.plugins.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.shared.transfer.artifact.ArtifactCoordinate;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
/**
* @author brianf
@@ -74,10 +73,11 @@ public class TestClassifierTypeTranslator
DependencyArtifactStubFactory factory = new DependencyArtifactStubFactory( null, false );
artifacts = factory.getMixedArtifacts();
+ LegacySupport legacySupport = lookup( LegacySupport.class );
MavenSession session = newMavenSession( new MavenProjectStub() );
+ legacySupport.setSession( session );
- DefaultRepositorySystemSession repoSession = (DefaultRepositorySystemSession) session.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( stubFactory.getWorkingDir() ) );
+ installLocalRepository( legacySupport );
}