You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2013/07/23 13:49:59 UTC
svn commit: r1505991 - in /maven/plugin-testing/trunk: ./
maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/
maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/
maven-plugin-testing-tools/src/test/java...
Author: jvanzyl
Date: Tue Jul 23 11:49:59 2013
New Revision: 1505991
URL: http://svn.apache.org/r1505991
Log:
o updating for maven 3.1.0
o updating to Eclipse Aether
o using new facilities in the container
Modified:
maven/plugin-testing/trunk/.gitignore
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java
maven/plugin-testing/trunk/pom.xml
Modified: maven/plugin-testing/trunk/.gitignore
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/.gitignore?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/.gitignore (original)
+++ maven/plugin-testing/trunk/.gitignore Tue Jul 23 11:49:59 2013
@@ -7,4 +7,4 @@ target
*.iml
.idea
.java-version
-
+.svn
Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/AbstractMojoTestCase.java Tue Jul 23 11:49:59 2013
@@ -50,10 +50,12 @@ import org.apache.maven.plugin.descripto
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenAetherModule;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
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.PlexusTestCase;
@@ -169,7 +171,13 @@ public abstract class AbstractMojoTestCa
{
ClassWorld classWorld = new ClassWorld( "plexus.core", Thread.currentThread().getContextClassLoader() );
- return new DefaultContainerConfiguration().setClassWorld( classWorld ).setName( "embedder" );
+ ContainerConfiguration cc = new DefaultContainerConfiguration()
+ .setClassWorld( classWorld )
+ .setClassPathScanning( PlexusConstants.SCANNING_INDEX )
+ .setAutoWiring( true )
+ .setName( "maven" );
+
+ return cc;
}
protected PlexusContainer getContainer()
@@ -373,7 +381,7 @@ public abstract class AbstractMojoTestCa
MavenExecutionRequest request = new DefaultMavenExecutionRequest();
MavenExecutionResult result = new DefaultMavenExecutionResult();
- MavenSession session = new MavenSession( container, new MavenRepositorySystemSession(), request, result );
+ MavenSession session = new MavenSession( container, MavenRepositorySystemUtils.newSession(), request, result );
session.setCurrentProject( project );
session.setProjects( Arrays.asList( project ) );
return session;
Modified: maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/MojoRule.java Tue Jul 23 11:49:59 2013
@@ -19,58 +19,19 @@ package org.apache.maven.plugin.testing;
* under the License.
*/
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.AccessibleObject;
-import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashMap;
import java.util.Map;
-import org.apache.commons.io.input.XmlStreamReader;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.execution.DefaultMavenExecutionRequest;
-import org.apache.maven.execution.DefaultMavenExecutionResult;
-import org.apache.maven.execution.MavenExecutionRequest;
-import org.apache.maven.execution.MavenExecutionResult;
import org.apache.maven.execution.MavenSession;
-import org.apache.maven.lifecycle.internal.MojoDescriptorCreator;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.monitor.logging.DefaultLog;
import org.apache.maven.plugin.Mojo;
import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.PluginParameterExpressionEvaluator;
-import org.apache.maven.plugin.descriptor.MojoDescriptor;
-import org.apache.maven.plugin.descriptor.Parameter;
-import org.apache.maven.plugin.descriptor.PluginDescriptor;
-import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
-import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.repository.RepositorySystem;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
import org.codehaus.plexus.ContainerConfiguration;
-import org.codehaus.plexus.DefaultContainerConfiguration;
-import org.codehaus.plexus.DefaultPlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.PlexusContainerException;
-import org.codehaus.plexus.PlexusTestCase;
-import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
-import org.codehaus.plexus.component.configurator.ComponentConfigurator;
-import org.codehaus.plexus.component.configurator.expression.ExpressionEvaluator;
-import org.codehaus.plexus.component.repository.ComponentDescriptor;
import org.codehaus.plexus.configuration.PlexusConfiguration;
-import org.codehaus.plexus.configuration.xml.XmlPlexusConfiguration;
-import org.codehaus.plexus.logging.LoggerManager;
-import org.codehaus.plexus.util.InterpolationFilterReader;
-import org.codehaus.plexus.util.ReaderFactory;
-import org.codehaus.plexus.util.ReflectionUtils;
-import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.Xpp3DomBuilder;
import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java Tue Jul 23 11:49:59 2013
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
@@ -50,7 +49,7 @@ import org.apache.maven.project.ProjectB
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.ProjectBuildingRequest;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.util.FileUtils;
@@ -241,7 +240,7 @@ public class ProjectTool
{
ProjectBuildingRequest request = new DefaultProjectBuildingRequest();
request.setLocalRepository( artifactRepositoryFactory.createArtifactRepository( "local", new File( "target/localrepo" ).getCanonicalFile().toURL().toExternalForm(), "default", null, null ) );
- request.setRepositorySession( new MavenRepositorySystemSession() );
+ request.setRepositorySession( MavenRepositorySystemUtils.newSession() );
MavenProject project = projectBuilder.build( pomInfo.getPomFile(), request ).getProject();
Artifact artifact = artifactFactory.createArtifact( project.getGroupId(), project.getArtifactId(), project
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/RepositoryTool.java Tue Jul 23 11:49:59 2013
@@ -40,7 +40,7 @@ import org.apache.maven.model.io.xpp3.Ma
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
-import org.apache.maven.repository.internal.MavenRepositorySystemSession;
+import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
import org.apache.maven.settings.MavenSettingsBuilder;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.PlexusConstants;
@@ -218,7 +218,7 @@ public class RepositoryTool
destination.getParentFile().mkdirs();
}
- legacySupport.setSession( new MavenSession( container, new MavenRepositorySystemSession(),
+ legacySupport.setSession( new MavenSession( container, MavenRepositorySystemUtils.newSession(),
new DefaultMavenExecutionRequest(),
new DefaultMavenExecutionResult() ) );
try
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/ProjectToolTest.java Tue Jul 23 11:49:59 2013
@@ -29,6 +29,8 @@ import org.apache.maven.artifact.metadat
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.maven.shared.test.plugin.ProjectTool.PomInfo;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
@@ -110,4 +112,11 @@ public class ProjectToolTest
assertTrue( foundPomMetadata );
}
+
+ @Override
+ protected void customizeContainerConfiguration(ContainerConfiguration configuration)
+ {
+ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ configuration.setAutoWiring( true );
+ }
}
Modified: maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java (original)
+++ maven/plugin-testing/trunk/maven-plugin-testing-tools/src/test/java/org/apache/maven/shared/test/plugin/RepositoryToolTest.java Tue Jul 23 11:49:59 2013
@@ -26,6 +26,8 @@ import org.apache.maven.artifact.factory
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.artifact.ProjectArtifactMetadata;
import org.apache.maven.shared.tools.easymock.TestFileManager;
+import org.codehaus.plexus.ContainerConfiguration;
+import org.codehaus.plexus.PlexusConstants;
import org.codehaus.plexus.PlexusTestCase;
/**
@@ -84,4 +86,11 @@ public class RepositoryToolTest
fileManager.assertFileContents( targetLocalRepoBasedir, "group/artifact/test/artifact-test.jar", jarContent );
}
+
+ @Override
+ protected void customizeContainerConfiguration(ContainerConfiguration configuration)
+ {
+ configuration.setClassPathScanning( PlexusConstants.SCANNING_INDEX );
+ configuration.setAutoWiring( true );
+ }
}
Modified: maven/plugin-testing/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugin-testing/trunk/pom.xml?rev=1505991&r1=1505990&r2=1505991&view=diff
==============================================================================
--- maven/plugin-testing/trunk/pom.xml (original)
+++ maven/plugin-testing/trunk/pom.xml Tue Jul 23 11:49:59 2013
@@ -114,7 +114,7 @@ under the License.
</mailingLists>
<prerequisites>
- <maven>3.0</maven>
+ <maven>3.1.0</maven>
</prerequisites>
<modules>
@@ -144,8 +144,8 @@ under the License.
</distributionManagement>
<properties>
- <mavenVersion>3.0.5</mavenVersion>
- <plexusVersion>1.5.1</plexusVersion>
+ <mavenVersion>3.1.0</mavenVersion>
+ <plexusVersion>1.5.5</plexusVersion>
<maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
</properties>
@@ -187,7 +187,7 @@ under the License.
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>3.0.8</version>
+ <version>3.0.10</version>
<scope>provided</scope>
</dependency>
@@ -226,10 +226,18 @@ under the License.
</systemProperties>
</configuration>
</plugin>
+ <!-- Not sure if this is intentional but MojoRule has an @Override annotation from the interface which is
+ only allowed starting in Java 1.6. So if the author intends only 1.5 then that @Override annotation needs
+ to be removed.
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>