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/06 10:47:30 UTC
[maven-dependency-plugin] 01/03: wip
This is an automated email from the ASF dual-hosted git repository.
elharo pushed a commit to branch 31compat
in repository https://gitbox.apache.org/repos/asf/maven-dependency-plugin.git
commit 067e3c51c1eb5937a6b04821cc0ea913052ccee9
Author: Elliotte Rusty Harold <el...@ibiblio.org>
AuthorDate: Sun Jul 5 18:52:04 2020 -0400
wip
---
pom.xml | 4 ++--
.../maven/plugins/dependency/TestGetMojo.java | 8 ++++----
...etClassesMojo.java => TestListClassesMojo.java} | 23 ++++++++++++----------
3 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2effeb..c497104 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@ under the License.
</contributors>
<properties>
- <mavenVersion>3.0</mavenVersion>
+ <mavenVersion>3.1.0</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>
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..6369b84 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestGetMojo.java
@@ -33,6 +33,8 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepositoryManager;
import org.eclipse.jetty.security.ConstraintMapping;
import org.eclipse.jetty.security.ConstraintSecurityHandler;
import org.eclipse.jetty.security.HashLoginService;
@@ -41,8 +43,6 @@ 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
@@ -56,7 +56,6 @@ 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 );
@@ -72,7 +71,8 @@ public class TestGetMojo
legacySupport.setSession( session );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+ LocalRepositoryManager simpleLocalRepositoryManager = lookup( LocalRepositoryManager.class, testDir.getAbsolutePath() );
+ repoSession.setLocalRepositoryManager( simpleLocalRepositoryManager );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
}
diff --git a/src/test/java/org/apache/maven/plugins/dependency/TestGetClassesMojo.java b/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
similarity index 82%
rename from src/test/java/org/apache/maven/plugins/dependency/TestGetClassesMojo.java
rename to src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
index 6139ed7..e838fc1 100644
--- a/src/test/java/org/apache/maven/plugins/dependency/TestGetClassesMojo.java
+++ b/src/test/java/org/apache/maven/plugins/dependency/TestListClassesMojo.java
@@ -21,28 +21,26 @@ package org.apache.maven.plugins.dependency;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.LegacySupport;
+import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
-import org.junit.Assert;
-import org.sonatype.aether.impl.internal.SimpleLocalRepositoryManager;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
+import org.eclipse.aether.DefaultRepositorySystemSession;
+import org.eclipse.aether.repository.LocalRepositoryManager;
import java.io.File;
-public class TestGetClassesMojo
- extends AbstractDependencyMojoTestCase
+public class TestListClassesMojo
+ extends AbstractMojoTestCase
{
private ListClassesMojo mojo;
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());
+
+ assertTrue( testPom.exists() );
mojo = (ListClassesMojo) lookupMojo( "list-classes", testPom );
assertNotNull( mojo );
@@ -58,7 +56,12 @@ public class TestGetClassesMojo
legacySupport.setSession( session );
DefaultRepositorySystemSession repoSession =
(DefaultRepositorySystemSession) legacySupport.getRepositorySession();
- repoSession.setLocalRepositoryManager( new SimpleLocalRepositoryManager( testDir.getAbsolutePath() ) );
+
+ File testDir = new File( getBasedir(), "target" + File.separatorChar + "unit-tests" + File.separatorChar + "markers"
+ + File.separatorChar );
+
+ LocalRepositoryManager localRepositoryManager = lookup( LocalRepositoryManager.class, testDir.getAbsolutePath() );
+ repoSession.setLocalRepositoryManager( localRepositoryManager );
setVariableValueToObject( mojo, "session", legacySupport.getSession() );
}