http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/site/apt/scripting-support/marmalade-support.apt ---------------------------------------------------------------------- diff --git a/maven-core/src/site/apt/scripting-support/marmalade-support.apt b/maven-core/src/site/apt/scripting-support/marmalade-support.apt index 87d4815..7a80966 100644 --- a/maven-core/src/site/apt/scripting-support/marmalade-support.apt +++ b/maven-core/src/site/apt/scripting-support/marmalade-support.apt @@ -24,173 +24,173 @@ --- Marmalade Support - + *Abstract - This document will track the design and implementation issues involved in + This document will track the design and implementation issues involved in adding support to m2 for marmalade-based mojos. - + *Design Notes [[1]] <<Marmalade mojo descriptor specification.>> - + As in all mojo specifications, it is ideal that the descriptor for a marmalade-based mojo be inline with the source code. This centralizes all maintenance related to a single mojo to a single point of maintenance. - + The following is what I'm thinking as of now: - + - a marmalade-based mojo should look something like: - + +---+ <mojo xmlns="m2:mojo" xmlns:marmalade-control="marmalade:marmalade-control" marmalade-control:el="none"> - + <metadata> <id>mmld</id> <name>mmldCompile</name> <lifecyclePhase>compile</lifecyclePhase> <description>Used to compile marmalade scripts into java beans.</description> - + <requiresDependencyResolution/> <instantiationStrategy/> <executionStrategy/> - + <parameters> - + <parameter> <name>classpath</name> <description>The compilation classpath</description> <type>java.util.List</type> <expression>#pom.artifacts</expression> - + <required/> <validator/> <default/> - + </parameter> - + </parameters> - + </metadata> - + <execute> <!-- Do some stuff. --> </execute> - + </mojo> +---+ [NOTE] All empty elements above signify optional elements, usage specification. [[2]] <<Marmalade mojo packager.>> - + The marmalade mojo packager will: - + [[a]] Locate all *.mmld files within the scripts directory of the project. - + The scripts directory should be tied to the script language within the POM. Until we have multiple language support in the POM, we'll use something like: <<<xpath(build/marmaladeSourceDirectory)>>>. - + [[b]] For each script found: - + [[i]] Execute the script with "gatherMetadata=true" in the context. - - [[ii]] Retrieve the mojo descriptor from the resulting "metadata" + + [[ii]] Retrieve the mojo descriptor from the resulting "metadata" variable in the context. - + [[iii]] Cache the mojo descriptor in aggregator for subsequent output to plugin descriptor file. - + [[c]] Copy all scripts to the target directory. Preserve relative paths. - + [[d]] <<Process Disjoint:>> <Allow other mojo-descriptor collectors to run, aggregating their descriptors in similar fashion to [b.iii] above.> - + [[e]] Use the project's dependencies and other info to form the plugin descriptor's header (non-mojo-specific info). - + [[f]] Use the PluginGenerator from maven-plugin-tools to generate a META-INF/plexus/plugin.xml to the target directory. - + [[g]] Continue with lifecycle. - - This may include compilation of java helper classes, etc. and + + This may include compilation of java helper classes, etc. and plugin-artifact packaging, presumably via 'jar:jar' or similar. - + [[3]] <<Marmalade mojo loader.>> - + The marmalade mojo loader will: - + [[a]] Retrieve the implementation spec (this is the path of the script, - relative to the root of the plugin filesystem...jar, etc.) to + relative to the root of the plugin filesystem...jar, etc.) to $path. - + [[b]] Use the context classloader to retrieve a reader to $path. - + [[c]] Build the ScriptBuilder corresponding to the script. - + [[d]] Create a new MarmaladeMojo instance which adapts the mojo calling semantics to the creation/execution of a marmalade script. - + Execution involves: - + [[i]] Creating a new MarmaladeScript instance. - + [[ii]] Creating an execution context which references all I/O from the main Maven execution thread, and embeds: - + - #request == MavenExecutionRequest - + - #response == MavenExecutionResponse - + - Any globally configured environmental constraints, such as a global preserve-whitespace setting - + [[iii]] Execution of the script using the execution context. - + [[iv]] Export of the resulting context, minus any surviving input variables, to the MavenExecutionResponse's out-params. *Implementation Issues [[1]] How do we make Maven smart enough to switch loader implementations based - on some sub-type of maven-plugin? - - This is important, since the default mojo loader will not be smart - enough to do the job, and embedding this behavior in that loader is not + on some sub-type of maven-plugin? + + This is important, since the default mojo loader will not be smart + enough to do the job, and embedding this behavior in that loader is not scalable or extensible enough to accommodate future expansion into the realms of jython, groovy, etc... - + <<UPDATE:07-FEB-2005>> - + We'll plan on using some sort of language specification in the mojo descriptor to determine which mojo loader to use, then we'll populate the PluginLoader/PluginManager with a map of known languages->loaders. - - [[2]] How do we make the plugin:install process smart enough to switch + + [[2]] How do we make the plugin:install process smart enough to switch generator implementations based on some sub-type of maven-plugin? - + This is closely related to [1] above. - + <<UPDATE:07-FEB-2005>> - + See update in [3]. - - [[3]] Do we want to allow mixed-bag plugin implementations? - - These might include a mix of standard-java and marmalade mojos. It - strikes me that many marmalade-based mojos may use beans/tags that are - actually adapter classes for other third-party APIs (why they wouldn't - implement everything as java mojos in this cases is beyond me). If they - have java source inside the plugin source directory, we should probably + + [[3]] Do we want to allow mixed-bag plugin implementations? + + These might include a mix of standard-java and marmalade mojos. It + strikes me that many marmalade-based mojos may use beans/tags that are + actually adapter classes for other third-party APIs (why they wouldn't + implement everything as java mojos in this cases is beyond me). If they + have java source inside the plugin source directory, we should probably compile it and bundle it with the plugin scripts; but what if this source - also has mojo annotations? This will have implications for [1] and [2] + also has mojo annotations? This will have implications for [1] and [2] above. - + <<UPDATE:07-FEB-2005>> - + We will plan on allowing this sort of implementation, and simply start by applying all known generators which have a source directory set in - the POM (or later, have a <language/> section, maybe). At any rate, + the POM (or later, have a <language/> section, maybe). At any rate, helper classes will be allowed for script-based mojos.
http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java index 8fca279..57d374f 100644 --- a/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java +++ b/maven-core/src/test/java/org/apache/maven/AbstractCoreMavenComponentTestCase.java @@ -92,7 +92,7 @@ public abstract class AbstractCoreMavenComponentTestCase * We need to customize the standard Plexus container with the plugin discovery listener which * is what looks for the META-INF/maven/plugin.xml resources that enter the system when a Maven * plugin is loaded. - * + * * We also need to customize the Plexus container with a standard plugin discovery listener * which is the MavenPluginCollector. When a Maven plugin is discovered the MavenPluginCollector * collects the plugin descriptors which are found. @@ -104,7 +104,7 @@ public abstract class AbstractCoreMavenComponentTestCase protected MavenExecutionRequest createMavenExecutionRequest( File pom ) throws Exception - { + { MavenExecutionRequest request = new DefaultMavenExecutionRequest() .setPom( pom ) .setProjectPresent( true ) @@ -122,16 +122,16 @@ public abstract class AbstractCoreMavenComponentTestCase // a Maven subclass because we don't want to couple maven to the project builder which we need to // separate. protected MavenSession createMavenSession( File pom ) - throws Exception + throws Exception { return createMavenSession( pom, new Properties() ); } - + protected MavenSession createMavenSession( File pom, Properties executionProperties ) throws Exception { MavenExecutionRequest request = createMavenExecutionRequest( pom ); - + ProjectBuildingRequest configuration = new DefaultProjectBuildingRequest() .setLocalRepository( request.getLocalRepository() ) .setRemoteRepositories( request.getRemoteRepositories() ) @@ -179,7 +179,7 @@ public abstract class AbstractCoreMavenComponentTestCase model.setVersion( "1.0" ); return new MavenProject( model ); } - + protected List<ArtifactRepository> getRemoteRepositories() throws InvalidRepositoryException { @@ -212,7 +212,7 @@ public abstract class AbstractCoreMavenComponentTestCase return repositorySystem.createLocalRepository( repoDir ); } - + protected class ProjectBuilder { private MavenProject project; @@ -228,11 +228,11 @@ public abstract class AbstractCoreMavenComponentTestCase model.setModelVersion( "4.0.0" ); model.setGroupId( groupId ); model.setArtifactId( artifactId ); - model.setVersion( version ); + model.setVersion( version ); model.setBuild( new Build() ); - project = new MavenProject( model ); + project = new MavenProject( model ); } - + public ProjectBuilder setGroupId( String groupId ) { project.setGroupId( groupId ); @@ -244,30 +244,30 @@ public abstract class AbstractCoreMavenComponentTestCase project.setArtifactId( artifactId ); return this; } - + public ProjectBuilder setVersion( String version ) { project.setVersion( version ); return this; } - + // Dependencies // public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope ) { return addDependency( groupId, artifactId, version, scope, (Exclusion)null ); } - + public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion ) { - return addDependency( groupId, artifactId, version, scope, null, exclusion ); + return addDependency( groupId, artifactId, version, scope, null, exclusion ); } public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath ) { - return addDependency( groupId, artifactId, version, scope, systemPath, null ); + return addDependency( groupId, artifactId, version, scope, systemPath, null ); } - + public ProjectBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion ) { Dependency d = new Dependency(); @@ -275,60 +275,60 @@ public abstract class AbstractCoreMavenComponentTestCase d.setArtifactId( artifactId ); d.setVersion( version ); d.setScope( scope ); - + if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) ) { d.setSystemPath( systemPath ); } - + if ( exclusion != null ) { d.addExclusion( exclusion ); } - + project.getDependencies().add( d ); - + return this; } - + // Plugins // public ProjectBuilder addPlugin( Plugin plugin ) { - project.getBuildPlugins().add( plugin ); + project.getBuildPlugins().add( plugin ); return this; } - + public MavenProject get() { return project; - } - } - + } + } + protected class PluginBuilder { private Plugin plugin; - + public PluginBuilder( String groupId, String artifactId, String version ) { plugin = new Plugin(); plugin.setGroupId( groupId ); plugin.setArtifactId( artifactId ); - plugin.setVersion( version ); + plugin.setVersion( version ); } - + // Dependencies // public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, Exclusion exclusion ) { - return addDependency( groupId, artifactId, version, scope, exclusion ); + return addDependency( groupId, artifactId, version, scope, exclusion ); } public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath ) { - return addDependency( groupId, artifactId, version, scope, systemPath, null ); + return addDependency( groupId, artifactId, version, scope, systemPath, null ); } - + public PluginBuilder addDependency( String groupId, String artifactId, String version, String scope, String systemPath, Exclusion exclusion ) { Dependency d = new Dependency(); @@ -336,25 +336,25 @@ public abstract class AbstractCoreMavenComponentTestCase d.setArtifactId( artifactId ); d.setVersion( version ); d.setScope( scope ); - + if ( systemPath != null && scope.equals( Artifact.SCOPE_SYSTEM ) ) { d.setSystemPath( systemPath ); } - + if ( exclusion != null ) { d.addExclusion( exclusion ); } - + plugin.getDependencies().add( d ); - + return this; } - + public Plugin get() { return plugin; - } - } + } + } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java index 7df09f6..17aeab3 100644 --- a/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java +++ b/maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java @@ -6,9 +6,9 @@ package org.apache.maven; * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. You may obtain a * copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java index 67a7575..ca75c3f 100644 --- a/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java +++ b/maven-core/src/test/java/org/apache/maven/ProjectDependenciesResolverTest.java @@ -65,7 +65,7 @@ public class ProjectDependenciesResolverTest new ProjectBuilder( project ).addDependency( "org.apache.maven.its", "b", "0.1", Artifact.SCOPE_RUNTIME, exclusion ); - + Set<Artifact> artifactDependencies = resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ); assertEquals( 0, artifactDependencies.size() ); @@ -75,7 +75,7 @@ public class ProjectDependenciesResolverTest assertEquals( "b", artifactDependencies.iterator().next().getArtifactId() ); } */ - + public void testSystemScopeDependencies() throws Exception { @@ -88,8 +88,8 @@ public class ProjectDependenciesResolverTest Set<Artifact> artifactDependencies = resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ); assertEquals( 1, artifactDependencies.size() ); - } - + } + public void testSystemScopeDependencyIsPresentInTheCompileClasspathElements() throws Exception { @@ -102,10 +102,10 @@ public class ProjectDependenciesResolverTest MavenProject project = session.getCurrentProject(); project.setArtifacts( resolver.resolve( project, Collections.singleton( Artifact.SCOPE_COMPILE ), session ) ); - + List<String> elements = project.getCompileClasspathElements(); assertEquals( 2, elements.size() ); - + @SuppressWarnings( "deprecation" ) List<Artifact> artifacts = project.getCompileArtifacts(); assertEquals( 1, artifacts.size() ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java index 698c6d1..fbb8b90 100644 --- a/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java +++ b/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenExecutionTest.java @@ -39,7 +39,7 @@ public class DefaultMavenExecutionTest assertNotNull( copy ); assertNotSame( copy, original ); } - + public void testResultWithNullTopologicallySortedProjectsIsEmptyList() { MavenExecutionResult result = new DefaultMavenExecutionResult(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java index b18fa10..04be08b 100644 --- a/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java +++ b/maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java @@ -213,14 +213,14 @@ public class LifecycleExecutorTest //[05] modello:xpp3-writer //[06] modello:java //[07] modello:xpp3-reader - //[08] plugin:descriptor + //[08] plugin:descriptor //[09] resources:resources //[10] compiler:compile //[11] resources:testResources //[12] compiler:testCompile //[13] surefire:test //[14] jar:jar - //[15] plugin:addPluginArtifactMetadata + //[15] plugin:addPluginArtifactMetadata //[16] install:install // http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java index e491629..bc87702 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginManagerTest.java @@ -45,7 +45,7 @@ public class PluginManagerTest super.setUp(); pluginManager = (DefaultBuildPluginManager) lookup( BuildPluginManager.class ); } - + @Override protected void tearDown() throws Exception @@ -62,7 +62,7 @@ public class PluginManagerTest public void testPluginLoading() throws Exception { - MavenSession session = createMavenSession( null ); + MavenSession session = createMavenSession( null ); Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.its.plugins" ); plugin.setArtifactId( "maven-it-plugin" ); @@ -72,17 +72,17 @@ public class PluginManagerTest session.getRepositorySession() ); assertNotNull( pluginDescriptor ); } - + public void testMojoDescriptorRetrieval() throws Exception { - MavenSession session = createMavenSession( null ); + MavenSession session = createMavenSession( null ); String goal = "it"; Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.its.plugins" ); plugin.setArtifactId( "maven-it-plugin" ); plugin.setVersion( "0.1" ); - + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject().getRemotePluginRepositories(), session.getRepositorySession() ); @@ -90,53 +90,53 @@ public class PluginManagerTest assertEquals( goal, mojoDescriptor.getGoal() ); // igorf: plugin realm comes later // assertNotNull( mojoDescriptor.getRealm() ); - + PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor(); assertNotNull( pluginDescriptor ); assertEquals( "org.apache.maven.its.plugins", pluginDescriptor.getGroupId() ); assertEquals( "maven-it-plugin", pluginDescriptor.getArtifactId() ); assertEquals( "0.1", pluginDescriptor.getVersion() ); } - + // ----------------------------------------------------------------------------------------------- // Tests which exercise the lifecycle executor when it is dealing with individual goals. // ----------------------------------------------------------------------------------------------- - + //TODO: These two tests display a lack of symmetry with respect to the input which is a free form string and the // mojo descriptor which comes back. All the free form parsing needs to be done somewhere else, this is // really the function of the CLI, and then the pre-processing of that output still needs to be fed into // a hinting process which helps flesh out the full specification of the plugin. The plugin manager should // only deal in concrete terms -- all version finding mumbo jumbo is a customization to base functionality // the plugin manager provides. - + public void testRemoteResourcesPlugin() throws Exception { //TODO: turn an equivalent back on when the RR plugin is released. - + /* This will not work until the RR plugin is released to get rid of the binding to the reporting exception which is a mistake. - + This happpens after removing the reporting API from the core: - + java.lang.NoClassDefFoundError: org/apache/maven/reporting/MavenReportException - - MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) ); + + MavenSession session = createMavenSession( getProject( "project-with-inheritance" ) ); String goal = "process"; - + Plugin plugin = new Plugin(); plugin.setGroupId( "org.apache.maven.plugins" ); plugin.setArtifactId( "maven-remote-resources-plugin" ); plugin.setVersion( "1.0-beta-2" ); - - MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() ); + + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getCurrentProject(), session.getLocalRepository() ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-remote-resources-plugin", "1.0-beta-2" ); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor ); pluginManager.executeMojo( session, mojoExecution ); */ } - + //TODO: this will be the basis of the customizable lifecycle execution so need to figure this out quickly. public void testSurefirePlugin() throws Exception @@ -151,22 +151,22 @@ public class PluginManagerTest plugin.setVersion( "2.4.2" ); // The project has already been fully interpolated so getting the raw mojoDescriptor is not going to have the processes configuration. - MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() ); + MojoDescriptor mojoDescriptor = pluginManager.getMojoDescriptor( plugin, goal, session.getLocalRepository(), session.getCurrentProject().getPluginArtifactRepositories() ); assertPluginDescriptor( mojoDescriptor, "org.apache.maven.plugins", "maven-surefire-plugin", "2.4.2" ); - + System.out.println( session.getCurrentProject().getBuild().getPluginsAsMap() ); - + Xpp3Dom configuration = (Xpp3Dom) session.getCurrentProject().getBuild().getPluginsAsMap().get( plugin.getKey() ).getExecutions().get( 0 ).getConfiguration(); MojoExecution mojoExecution = new MojoExecution( mojoDescriptor, configuration ); pluginManager.executeMojo( session, mojoExecution ); */ } - + public void testMojoConfigurationIsMergedCorrectly() throws Exception { } - + /** * The case where the user wants to specify an alternate version of the underlying tool. Common case * is in the Antlr plugin which comes bundled with a version of Antlr but the user often times needs @@ -177,7 +177,7 @@ public class PluginManagerTest { } - /** + /** * The case where you have a plugin in the current build that you want to be used on projects in * the current build. */ @@ -203,13 +203,13 @@ public class PluginManagerTest throws Exception { } - + // test that mojo which does not require dependency resolution trigger no downloading of dependencies - + // test interpolation of basedir values in mojo configuration - + // test a build where projects use different versions of the same plugin - + public void testThatPluginDependencyThatHasSystemScopeIsResolved() throws Exception { @@ -218,27 +218,27 @@ public class PluginManagerTest Plugin plugin = new PluginBuilder( "org.apache.maven", "project-test", "1.0" ) .addDependency( "org.apache.maven", "system-dependency", "1.0", Artifact.SCOPE_SYSTEM, systemPath.getAbsolutePath() ) - .get(); + .get(); MavenProject pluginProject = new ProjectBuilder( "org.apache.maven", "project-test", "1.0" ) .addPlugin( plugin ) .addDependency( "junit", "junit", "3.8.1", Artifact.SCOPE_COMPILE ) - .get(); - + .get(); + // i'm making this artifact which is assumed to come from a pom in the metadata processor, then it tries to create a POM artifact // and parse it for the dependencies and it blows up. // // we need to pass this through as is so it doesn't get parsed again. Artifact pluginArtifact = new ProjectArtifact( pluginProject ); - + Set<Artifact> artifacts = pluginManager.getPluginArtifacts( pluginArtifact, plugin, getLocalRepository(), getPluginArtifactRepositories() ); System.out.println( artifacts ); */ - + MavenSession session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) ); MavenProject project = session.getCurrentProject(); - Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" ); - + Plugin plugin = project.getPlugin( "org.apache.maven.its.plugins:maven-it-plugin" ); + RepositoryRequest repositoryRequest = new DefaultRepositoryRequest(); repositoryRequest.setLocalRepository( getLocalRepository() ); repositoryRequest.setRemoteRepositories( getPluginArtifactRepositories() ); @@ -257,23 +257,23 @@ public class PluginManagerTest return; } } - + fail( "Can't find the system scoped dependency in the plugin artifacts." ); } - + // ----------------------------------------------------------------------------------------------- // Testing help // ----------------------------------------------------------------------------------------------- protected void assertPluginDescriptor( MojoDescriptor mojoDescriptor, String groupId, String artifactId, String version ) { - assertNotNull( mojoDescriptor ); + assertNotNull( mojoDescriptor ); PluginDescriptor pd = mojoDescriptor.getPluginDescriptor(); assertNotNull( pd ); assertEquals( groupId, pd.getGroupId() ); assertEquals( artifactId, pd.getArtifactId() ); - assertEquals( version, pd.getVersion() ); - } + assertEquals( version, pd.getVersion() ); + } public void testPluginRealmCache() throws Exception @@ -299,7 +299,7 @@ public class PluginManagerTest assertNotNull( descriptor.getRealm() ); assertNotNull( descriptor.getImplementationClass() ); } - + // reload plugin realm from cache session = createMavenSession( getProject( "project-contributing-system-scope-plugin-dep" ) ); project = session.getCurrentProject(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java index 7f94bac..ead7ae2 100644 --- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java +++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExceptionTest.java @@ -29,7 +29,7 @@ import junit.framework.TestCase; /** * MNG-3131 - * + * * @author Robert Scholte * */ @@ -49,24 +49,24 @@ public class PluginParameterExceptionTest Parameter parameter = new Parameter(); parameter.setType( "java.lang.String[]" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "<configuration>\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "<configuration>\n" + + " ...\n" + " <toAddresses>\n" + " <item>VALUE</item>\n" + - " </toAddresses>\n" + + " </toAddresses>\n" + "</configuration>.\n", exception.buildDiagnosticMessage() ); } - + public void testMissingRequiredCollectionTypeParameter() { MojoDescriptor mojoDescriptor = new MojoDescriptor(); @@ -79,21 +79,21 @@ public class PluginParameterExceptionTest Parameter parameter = new Parameter(); parameter.setType( "java.util.List" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "<configuration>\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "<configuration>\n" + + " ...\n" + " <toAddresses>\n" + " <item>VALUE</item>\n" + - " </toAddresses>\n" + + " </toAddresses>\n" + "</configuration>.\n", exception.buildDiagnosticMessage() ); } @@ -109,21 +109,21 @@ public class PluginParameterExceptionTest Parameter parameter = new Parameter(); parameter.setType( "java.util.Map" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "<configuration>\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "<configuration>\n" + + " ...\n" + " <toAddresses>\n" + " <KEY>VALUE</KEY>\n" + - " </toAddresses>\n" + + " </toAddresses>\n" + "</configuration>.\n", exception.buildDiagnosticMessage() ); } @@ -139,24 +139,24 @@ public class PluginParameterExceptionTest Parameter parameter = new Parameter(); parameter.setType( "java.util.Properties" ); parameter.setName( "toAddresses" ); - + parameter.setRequired( true ); PluginParameterException exception = new PluginParameterException( mojoDescriptor, Collections.singletonList( parameter ) ); - assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + - "\n" + - "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + - "\n" + - "<configuration>\n" + - " ...\n" + + assertEquals( "One or more required plugin parameters are invalid/missing for 'goalPrefix:goal'\n" + + "\n" + + "[0] Inside the definition for plugin 'artifactId', specify the following:\n" + + "\n" + + "<configuration>\n" + + " ...\n" + " <toAddresses>\n" + " <property>\n" + " <name>KEY</name>\n" + " <value>VALUE</value>\n" + " </property>\n" + - " </toAddresses>\n" + + " </toAddresses>\n" + "</configuration>.\n", exception.buildDiagnosticMessage() ); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java ---------------------------------------------------------------------- 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 4cc1e89..73bdbca 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 @@ -6,9 +6,9 @@ package org.apache.maven.project; * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License. You may obtain a * copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express * or implied. See the License for the specific language governing permissions and limitations under @@ -55,7 +55,7 @@ public abstract class AbstractMavenProjectTestCase throws Exception { super.setUp(); - + if ( getContainer().hasComponent( ProjectBuilder.class, "test" ) ) { projectBuilder = lookup( ProjectBuilder.class, "test" ); @@ -65,9 +65,9 @@ public abstract class AbstractMavenProjectTestCase // default over to the main project builder... projectBuilder = lookup( ProjectBuilder.class ); } - - repositorySystem = lookup( RepositorySystem.class ); - } + + repositorySystem = lookup( RepositorySystem.class ); + } @Override protected void tearDown() http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/DefaultMavenProjectBuilderTest.java ---------------------------------------------------------------------- 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 d7c2470..13c32ab 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 @@ -143,7 +143,7 @@ public class DefaultMavenProjectBuilderTest null, null ); return r; } - + public void xtestLoop() throws Exception { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java index e6b2693..8ff912f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyLifecycleExecutor.java @@ -34,7 +34,7 @@ import org.apache.maven.plugin.MojoExecution; /** * A stub implementation that assumes an empty lifecycle to bypass interaction with the plugin manager and to avoid * plugin artifact resolution from repositories. - * + * * @author Benjamin Bentmann */ public class EmptyLifecycleExecutor @@ -50,7 +50,7 @@ public class EmptyLifecycleExecutor { return new MavenExecutionPlan( null, null ); } - + public void execute( MavenSession session ) { } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java index e59988d..21e37f1 100644 --- a/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java +++ b/maven-core/src/test/java/org/apache/maven/project/EmptyProjectBuildingHelper.java @@ -28,7 +28,7 @@ import org.apache.maven.model.Repository; /** * A stub implementation to bypass artifact resolution from repositories. - * + * * @author Benjamin Bentmann */ public class EmptyProjectBuildingHelper http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java index a37ccf7..6872701 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ExtensionDescriptorBuilderTest.java @@ -28,7 +28,7 @@ import junit.framework.TestCase; /** * Tests {@link ExtensionDescriptorBuilder}. - * + * * @author Benjamin Bentmann */ public class ExtensionDescriptorBuilderTest http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java index c6248ad..0c5cd07 100644 --- a/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/MavenProjectTest.java @@ -47,7 +47,7 @@ public class MavenProjectTest childModel.setArtifactId( "artifact" ); MavenProject childProject = new MavenProject( childModel ); - + File childFile = new File( System.getProperty( "java.io.tmpdir" ), "maven-project-tests" + System.currentTimeMillis() + "/child/pom.xml" ); @@ -57,7 +57,7 @@ public class MavenProjectTest String adjustment = parentProject.getModulePathAdjustment( childProject ); assertNotNull( adjustment ); - + assertEquals( "..", adjustment ); } @@ -147,11 +147,11 @@ public class MavenProjectTest assertEquals( "..", pathAdjustment ); } - + public void testCloneWithDistributionManagement() throws Exception { - + File f = getFileForClasspathResource( "distributionManagement-pom.xml" ); MavenProject projectToClone = getProject( f ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java index 392d9cd..f17539b 100644 --- a/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/PomConstructionTest.java @@ -50,9 +50,9 @@ public class PomConstructionTest private static String BASE_MIXIN_DIR = BASE_DIR + "/resources-mixins"; private DefaultProjectBuilder projectBuilder; - + private RepositorySystem repositorySystem; - + private File testDirectory; @Override @@ -71,7 +71,7 @@ public class PomConstructionTest projectBuilder = (DefaultProjectBuilder) lookup( ProjectBuilder.class ); repositorySystem = lookup( RepositorySystem.class ); } - + @Override protected void tearDown() throws Exception @@ -80,13 +80,13 @@ public class PomConstructionTest super.tearDown(); } - + /** - * Will throw exception if url is empty. MNG-4050 + * Will throw exception if url is empty. MNG-4050 * * @throws Exception */ - + public void testEmptyUrl() throws Exception { @@ -95,7 +95,7 @@ public class PomConstructionTest /** * Tests that modules is not overriden by profile - * + * * @throws Exception */ /* MNG-786*/ @@ -137,10 +137,10 @@ public class PomConstructionTest PomTestWrapper pom = buildPom( "plugin-config-properties" ); assertEquals( "my.property", pom.getValue( "build/plugins[1]/configuration[1]/systemProperties[1]/property[1]/name" ) ); } - + /*MNG-3900*/ public void testProfilePropertiesInterpolation() - throws Exception + throws Exception { PomTestWrapper pom = buildPom( "profile-properties-interpolation", "interpolation-profile" ); assertEquals( "PASSED", pom.getValue( "properties[1]/test" ) ); @@ -267,15 +267,15 @@ public class PomConstructionTest throws Exception { PomTestWrapper pom = buildPomFromMavenProject( "maven-build/sub/pom.xml", null ); - - for( String s: pom.getMavenProject().getTestClasspathElements() ) + + for( String s: pom.getMavenProject().getTestClasspathElements() ) { System.out.println( s ); } - + } */ - + /* MNG-3567*/ public void testPluginManagementInherited() throws Exception @@ -349,13 +349,13 @@ public class PomConstructionTest assertEquals( "src/main/mdo/security.xml", ( pom.getValue( "build/plugins[1]/executions[2]/configuration[1]/model" ) ) ); } - + /* public void testPluginConfigDuplicate() throws Exception { PomTestWrapper pom = buildPom( "plugin-config-duplicate/dup" ); -} +} */ @@ -839,14 +839,14 @@ public class PomConstructionTest { testAppendOfInheritedPluginConfiguration( "no-profile" ); } - + /* MNG-2591*/ public void testAppendOfInheritedPluginConfigurationWithActiveProfile() throws Exception { testAppendOfInheritedPluginConfiguration( "with-profile" ); } - + private void testAppendOfInheritedPluginConfiguration( String test ) throws Exception { @@ -955,14 +955,14 @@ public class PomConstructionTest assertEquals( "b", pom.getValue( "dependencies[3]/artifactId" ) ); assertEquals( "d", pom.getValue( "dependencies[4]/artifactId" ) ); } - + /** IT-0021*/ public void testProfileDependenciesMultipleProfiles() throws Exception { PomTestWrapper pom = buildPom( "profile-dependencies-multiple-profiles", "profile-1", "profile-2" ); assertEquals(2, ( (List<?>) pom.getValue( "dependencies" ) ).size() ); - } + } public void testDependencyInheritance() throws Exception @@ -993,7 +993,7 @@ public class PomConstructionTest PomTestWrapper pom = this.buildPom( "profile-module-inheritance/sub", "dist" ); assertEquals( 0, ( (List<?>) pom.getValue( "modules" ) ).size() ); } - + /** MNG-3621 */ public void testUncPath() throws Exception @@ -1001,7 +1001,7 @@ public class PomConstructionTest PomTestWrapper pom = this.buildPom( "unc-path/sub" ); assertEquals( "file:////host/site/test-child", pom.getValue( "distributionManagement/site/url" ) ); } - + /** MNG-2006 */ public void testUrlAppendWithChildPathAdjustment() throws Exception @@ -1012,7 +1012,7 @@ public class PomConstructionTest assertEquals( "http://scm.project.url/child";, pom.getValue( "scm/connection" ) ); assertEquals( "https://scm.project.url/child";, pom.getValue( "scm/developerConnection" ) ); assertEquals( "http://site.project.url/child";, pom.getValue( "distributionManagement/site/url" ) ); - } + } /** MNG-0479 */ public void testRepoInheritance() @@ -1021,15 +1021,15 @@ public class PomConstructionTest PomTestWrapper pom = this.buildPom( "repo-inheritance" ); assertEquals( 1, ( (List<?>) pom.getValue( "repositories" ) ).size() ); assertEquals( "it0043", pom.getValue( "repositories[1]/name" ) ); - } - + } + public void testEmptyScm() throws Exception { PomTestWrapper pom = this.buildPom( "empty-scm" ); assertNull( pom.getValue( "scm" ) ); - } - + } + public void testPluginConfigurationUsingAttributesWithoutPluginManagement() throws Exception { @@ -1100,8 +1100,8 @@ public class PomConstructionTest assertEquals( "childParam", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[2]" ) ); assertEquals( " preserve space ", pom.getValue( "reporting/plugins[1]/configuration/stringParams[1]/stringParam[3]" ) ); assertEquals( "true", pom.getValue( "reporting/plugins[1]/configuration/booleanParam" ) ); - } - + } + public void testPropertiesNoDuplication() throws Exception { @@ -1381,7 +1381,7 @@ public class PomConstructionTest assertEquals( "CHILD", pom.getValue( "properties/overridden" ) ); assertEquals( "CHILD", pom.getValue( "properties/interpolated" ) ); } - + /* MNG-3545 */ public void testProfileDefaultActivation() throws Exception @@ -1390,30 +1390,30 @@ public class PomConstructionTest assertEquals( 1, pom.getMavenProject().getActiveProfiles().size() ); assertEquals( 1, ( (List<?>) pom.getValue( "build/plugins" ) ).size() ); assertEquals( "2.1", pom.getValue( "build/plugins[1]/version" ) ); - } - + } + /* MNG-1995 */ public void testBooleanInterpolation() throws Exception { PomTestWrapper pom = buildPom( "boolean-interpolation" ); - assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) ); - assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) ); - } + assertTrue ((Boolean) pom.getValue( "repositories[1]/releases/enabled" ) ); + assertTrue((Boolean) pom.getValue( "build/resources[1]/filtering" ) ); + } + - /* MNG-3899 */ public void testBuildExtensionInheritance() throws Exception { - PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" ); + PomTestWrapper pom = buildPom( "build-extension-inheritance/sub" ); assertEquals( 3, ( (List<?>) pom.getValue( "build/extensions" ) ).size() ); assertEquals( "b", pom.getValue( "build/extensions[1]/artifactId" ) ); assertEquals( "a", pom.getValue( "build/extensions[2]/artifactId" ) ); assertEquals( "0.2", pom.getValue( "build/extensions[2]/version" ) ); assertEquals( "c", pom.getValue( "build/extensions[3]/artifactId" ) ); } - + /*MNG-1957*/ public void testJdkActivation() throws Exception @@ -1426,16 +1426,16 @@ public class PomConstructionTest assertEquals( "PASSED", pom.getValue( "properties/jdkProperty3" ) ); assertEquals( "PASSED", pom.getValue( "properties/jdkProperty2" ) ); assertEquals( "PASSED", pom.getValue( "properties/jdkProperty1" ) ); - } - + } + /* MNG-2174 */ public void testProfilePluginMngDependencies() throws Exception { PomTestWrapper pom = buildPom( "profile-plugin-mng-dependencies/sub", "maven-core-it" ); assertEquals( "a", pom.getValue( "build/plugins[1]/dependencies[1]/artifactId" ) ); - } - + } + /** MNG-4116 */ public void testPercentEncodedUrlsMustNotBeDecoded() throws Exception @@ -1453,7 +1453,7 @@ public class PomConstructionTest pom.getValue( "distributionManagement/snapshotRepository/url" ) ); assertEquals( "scm:svn:svn+ssh://site.apache.org/spacy%20path", pom.getValue( "distributionManagement/site/url" ) ); - } + } public void testPluginManagementInheritance() throws Exception @@ -1461,57 +1461,57 @@ public class PomConstructionTest PomTestWrapper pom = this.buildPom( "plugin-management-inheritance" ); assertEquals( "0.1-stub-SNAPSHOT", pom.getValue( "build/pluginManagement/plugins[@artifactId='maven-compiler-plugin']/version" ) ); - } - + } + public void testProfilePlugins() throws Exception { PomTestWrapper pom = this.buildPom( "profile-plugins", "standard" ); assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() ); assertEquals( "maven-assembly2-plugin", pom.getValue( "build/plugins[2]/artifactId" ) ); - } - + } + public void testPluginInheritanceSimple() throws Exception { PomTestWrapper pom = this.buildPom( "plugin-inheritance-simple/sub" ); - assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() ); - } - + assertEquals( 2, ( (List<?>) pom.getValue( "build/plugins" ) ).size() ); + } + public void testPluginManagementDuplicate() throws Exception { PomTestWrapper pom = this.buildPom( "plugin-management-duplicate/sub" ); assertEquals( 12, ( (List<?>) pom.getValue( "build/pluginManagement/plugins" ) ).size() ); - } - + } + public void testDistributionManagement() throws Exception { PomTestWrapper pom = this.buildPom( "distribution-management" ); assertEquals( "legacy", pom.getValue( "distributionManagement/repository/layout" ) ); - } - + } + public void testDependencyScopeInheritance() throws Exception { PomTestWrapper pom = buildPom( "dependency-scope-inheritance/sub" ); String scope = (String) pom.getValue( "dependencies[1]/scope" ); assertEquals( "compile", scope ); - } - + } + public void testDependencyScope() throws Exception { buildPom( "dependency-scope/sub" ); - } - + } + //This will fail on a validation error if incorrect public void testDependencyManagementWithInterpolation() throws Exception { buildPom( "dependency-management-with-interpolation/sub" ); - } + } public void testInterpolationWithSystemProperty() throws Exception @@ -1520,7 +1520,7 @@ public class PomConstructionTest sysProps.setProperty( "system.property", "PASSED" ); PomTestWrapper pom = buildPom( "sytem-property-interpolation", sysProps ); assertEquals( "PASSED", pom.getValue( "name" ) ); - } + } /* MNG-4129 */ public void testPluginExecutionInheritanceWhenChildDoesNotDeclarePlugin() @@ -1543,8 +1543,8 @@ public class PomConstructionTest (List<PluginExecution>) pom.getValue( "build/pluginsAsMap[@name='org.apache.maven.its.plugins:maven-it-plugin-log-file']/executions" ); assertEquals( 1, executions.size() ); assertEquals( "inherited-execution", executions.get( 0 ).getId() ); - } - + } + /* MNG-4193 */ public void testValidationErrorUponNonUniqueArtifactRepositoryId() throws Exception @@ -1574,7 +1574,7 @@ public class PomConstructionTest // expected } } - + /* MNG-4193 */ public void testValidationErrorUponNonUniqueArtifactRepositoryIdInProfile() throws Exception @@ -1611,7 +1611,7 @@ public class PomConstructionTest { PomTestWrapper pom = buildPom( "prerequisites-inheritance/child" ); assertSame( null, pom.getValue( "prerequisites" ) ); - } + } public void testLicensesAreInheritedButNotAggregated() throws Exception @@ -1620,7 +1620,7 @@ public class PomConstructionTest assertEquals( 1, ( (List<?>) pom.getValue( "licenses" ) ).size() ); assertEquals( "child-license", pom.getValue( "licenses[1]/name" ) ); assertEquals( "http://child.url/license";, pom.getValue( "licenses[1]/url" ) ); - } + } public void testDevelopersAreInheritedButNotAggregated() throws Exception @@ -1636,7 +1636,7 @@ public class PomConstructionTest PomTestWrapper pom = buildPom( "contributors-inheritance/child-2" ); assertEquals( 1, ( (List<?>) pom.getValue( "contributors" ) ).size() ); assertEquals( "child-contributor", pom.getValue( "contributors[1]/name" ) ); - } + } public void testMailingListsAreInheritedButNotAggregated() throws Exception @@ -1644,7 +1644,7 @@ public class PomConstructionTest PomTestWrapper pom = buildPom( "mailing-lists-inheritance/child-2" ); assertEquals( 1, ( (List<?>) pom.getValue( "mailingLists" ) ).size() ); assertEquals( "child-mailing-list", pom.getValue( "mailingLists[1]/name" ) ); - } + } public void testPluginInheritanceOrder() throws Exception @@ -1818,7 +1818,7 @@ public class PomConstructionTest { assertEquals( new File( value.toString() ).getPath(), value.toString() ); } - + private PomTestWrapper buildPom( String pomPath, String... profileIds ) throws Exception { @@ -1863,7 +1863,7 @@ public class PomConstructionTest protected void assertModelEquals( PomTestWrapper pom, Object expected, String expression ) { - assertEquals( expected, pom.getValue( expression ) ); + assertEquals( expected, pom.getValue( expression ) ); } private static String createPath( List<String> elements ) http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java index fc12b3e..add3efe 100644 --- a/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/ProjectBuilderTest.java @@ -39,16 +39,16 @@ public class ProjectBuilderTest throws Exception { File pom = getProject( "it0063" ); - + Properties eps = new Properties(); - eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() ); - + eps.setProperty( "jre.home", new File( pom.getParentFile(), "jdk/jre" ).getPath() ); + MavenSession session = createMavenSession( pom, eps ); MavenProject project = session.getCurrentProject(); - + // Here we will actually not have any artifacts because the ProjectDependenciesResolver is not involved here. So // right now it's not valid to ask for artifacts unless plugins require the artifacts. - + project.getCompileClasspathElements(); } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java index 9a7a72c..67c0037 100644 --- a/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java +++ b/maven-core/src/test/java/org/apache/maven/project/TestMetadataSource.java @@ -38,14 +38,14 @@ public class TestMetadataSource public ResolutionGroup retrieve( Artifact artifact, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories ) throws ArtifactMetadataRetrievalException - { + { ResolutionGroup rg = super.retrieve( artifact, localRepository, remoteRepositories ); - + for ( Artifact a : rg.getArtifacts() ) { a.setResolved( true ); } - + return rg; } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java index ba37803..6b103b2 100644 --- a/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java +++ b/maven-core/src/test/java/org/apache/maven/project/artifact/DefaultMavenMetadataCacheTest.java @@ -75,7 +75,7 @@ public class DefaultMavenMetadataCacheTest CacheKey k1 = new CacheKey( a1, false, lr1, Collections.singletonList( rr1 ) ); CacheKey k2 = new CacheKey( a2, false, lr2, Collections.singletonList( rr2 ) ); - + assertEquals(k1.hashCode(), k2.hashCode()); } } http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java index 7b6713e..2811a84 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributeIterator.java @@ -31,7 +31,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; /** * An attribute iterator for JXPath to support <code>Xpp3Dom</code>. - * + * * @author Benjamin Bentmann */ class Xpp3DomAttributeIterator http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java index e1aa29f..04514b1 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomAttributePointer.java @@ -26,7 +26,7 @@ import org.apache.commons.jxpath.ri.model.NodePointer; /** * An attribute pointer for JXPath to support <code>Xpp3Dom</code>. - * + * * @author Benjamin Bentmann */ class Xpp3DomAttributePointer http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java index bf865b2..796a5ca 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodeIterator.java @@ -33,7 +33,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; /** * A node iterator for JXPath to support <code>Xpp3Dom</code>. - * + * * @author Benjamin Bentmann */ class Xpp3DomNodeIterator http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java index 59ce300..f93bd89 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomNodePointer.java @@ -30,7 +30,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; /** * A node pointer for JXPath to support <code>Xpp3Dom</code>. - * + * * @author Benjamin Bentmann */ class Xpp3DomNodePointer http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java index e3a08fb..28c0f8f 100644 --- a/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java +++ b/maven-core/src/test/java/org/apache/maven/project/harness/Xpp3DomPointerFactory.java @@ -28,7 +28,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom; /** * A node pointer factory for JXPath to support <code>Xpp3Dom</code>. - * + * * @author Benjamin Bentmann */ public class Xpp3DomPointerFactory http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java index d7d196e..77a6bae 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java +++ b/maven-core/src/test/java/org/apache/maven/repository/LegacyRepositoryLayout.java @@ -39,7 +39,7 @@ public class LegacyRepositoryLayout { return "legacy"; } - + public String pathOf( Artifact artifact ) { ArtifactHandler artifactHandler = artifact.getArtifactHandler(); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java index 0f90e1d..db1fecb 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java +++ b/maven-core/src/test/java/org/apache/maven/repository/TestArtifactHandler.java @@ -23,7 +23,7 @@ import org.apache.maven.artifact.handler.ArtifactHandler; /** * Assists unit testing. - * + * * @author Benjamin Bentmann */ class TestArtifactHandler http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java index 6208c88..c4afc7a 100644 --- a/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java +++ b/maven-core/src/test/java/org/apache/maven/repository/TestRepositorySystem.java @@ -66,8 +66,8 @@ public class TestRepositorySystem private ModelReader modelReader; @Requirement - private ArtifactFactory artifactFactory; - + private ArtifactFactory artifactFactory; + public ArtifactRepository buildArtifactRepository( Repository repository ) throws InvalidRepositoryException { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java index da0318c..55d330a 100644 --- a/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java +++ b/maven-core/src/test/java/org/apache/maven/toolchain/DefaultToolchainTest.java @@ -40,17 +40,17 @@ public class DefaultToolchainTest { InputStream jdksIS = null; InputStream jdksExtraIS = null; - try + try { jdksIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks.xml" ); jdksExtraIS = ToolchainModel.class.getResourceAsStream( "toolchains-jdks-extra.xml" ); - + PersistedToolchains jdks = reader.read( jdksIS ); PersistedToolchains jdksExtra = reader.read( jdksExtraIS ); - + JavaToolchainImpl tc1 = new JavaToolchainImpl( jdks.getToolchains().get( 0 ), null ); JavaToolchainImpl tc2 = new JavaToolchainImpl( jdksExtra.getToolchains().get( 0 ), null ); - + assertTrue( tc1.equals( tc1 ) ); assertFalse( tc1.equals( tc2 ) ); assertFalse( tc2.equals( tc1 ) ); http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml index 6a6f319..a821765 100644 --- a/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/mojo-configuration/pom.xml @@ -63,5 +63,5 @@ </executions> </plugin> </plugins> - </build> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml index c3dc612..8308088 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/pom.xml @@ -66,7 +66,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> <version>0.1</version> - </plugin> + </plugin> </plugins> - </build> + </build> </project> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java index 1842526..826279c 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/main/java/org/apache/maven/lifecycle/test/App.java @@ -4,7 +4,7 @@ package org.apache.maven.lifecycle.test; * Hello world! * */ -public class App +public class App { public static void main( String[] args ) { http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java index cf1e5f6..469cb2c 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-additional-lifecycle-elements/src/test/java/org/apache/maven/lifecycle/test/AppTest.java @@ -7,7 +7,7 @@ import junit.framework.TestSuite; /** * Unit test for simple App. */ -public class AppTest +public class AppTest extends TestCase { /** http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml index ededdb9..0f49e9a 100644 --- a/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/lifecycle-executor/project-with-inheritance/pom.xml @@ -45,22 +45,22 @@ under the License. <properties> <classWorldsVersion>1.3</classWorldsVersion> <commonsCliVersion>1.0</commonsCliVersion> - <!-- - + <!-- + Do not update this, Doxia will be decoupled completely from 3.x and someone can - create a rendering engine for it if they like when the release stabilizes. JVZ - + create a rendering engine for it if they like when the release stabilizes. JVZ + --> <doxiaVersion>1.0-alpha-9</doxiaVersion> <easyMockVersion>1.2_Java1.3</easyMockVersion> - <junitVersion>3.8.1</junitVersion> + <junitVersion>3.8.1</junitVersion> <plexusVersion>1.0-beta-3.0.7</plexusVersion> <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion> <plexusInterpolationVersion>1.1</plexusInterpolationVersion> <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion> <plexusUtilsVersion>1.5.8</plexusUtilsVersion> <plexusJetty6Version>1.6</plexusJetty6Version> - <plexusWebdavVersion>1.0</plexusWebdavVersion> + <plexusWebdavVersion>1.0</plexusWebdavVersion> <wagonVersion>1.0-beta-4</wagonVersion> <modelBuilderVersion>1.7-SNAPSHOT</modelBuilderVersion> <mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion> @@ -247,7 +247,7 @@ under the License. <module>maven-toolchain</module> <module>maven-compat</module> <module>maven-repository</module> - <module>maven-repository-mercury</module> + <module>maven-repository-mercury</module> </modules> <!--start--> <dependencies> @@ -366,11 +366,11 @@ under the License. </exclusion> </exclusions> </dependency> - + <!-- Plexus test dependencies --> <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-jetty6</artifactId> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-jetty6</artifactId> <version>${plexusJetty6Version}</version> <scope>test</scope> </dependency> @@ -380,7 +380,7 @@ under the License. <version>${plexusWebdavVersion}</version> <scope>test</scope> </dependency> - + <!-- Wagon --> <dependency> <groupId>org.apache.maven.wagon</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml index 00e1ce4..41b99c7 100644 --- a/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml +++ b/maven-core/src/test/projects/lifecycle-listener/lifecycle-listener-dependency-injection/pom.xml @@ -4,7 +4,7 @@ <groupId>org.apache.maven.lifecycle-listener.test</groupId> <artifactId>simple</artifactId> <version>1.0</version> - + <properties> <foo>${injected}</foo> </properties> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml index 376a736..a9fa3ca 100644 --- a/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-contributing-system-scope-plugin-dep/pom.xml @@ -5,7 +5,7 @@ <artifactId>test2</artifactId> <version>1.0</version> - <name>Maven Integration Test :: MNG-3586</name> + <name>Maven Integration Test :: MNG-3586</name> <description> Test that plugin dependencies with scope system are part of the plugin class realm. </description> @@ -37,7 +37,7 @@ <goal>load</goal> </goals> </execution> - </executions> + </executions> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml index ededdb9..0f49e9a 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-inheritance/pom.xml @@ -45,22 +45,22 @@ under the License. <properties> <classWorldsVersion>1.3</classWorldsVersion> <commonsCliVersion>1.0</commonsCliVersion> - <!-- - + <!-- + Do not update this, Doxia will be decoupled completely from 3.x and someone can - create a rendering engine for it if they like when the release stabilizes. JVZ - + create a rendering engine for it if they like when the release stabilizes. JVZ + --> <doxiaVersion>1.0-alpha-9</doxiaVersion> <easyMockVersion>1.2_Java1.3</easyMockVersion> - <junitVersion>3.8.1</junitVersion> + <junitVersion>3.8.1</junitVersion> <plexusVersion>1.0-beta-3.0.7</plexusVersion> <plexusInteractivityVersion>1.0-alpha-6</plexusInteractivityVersion> <plexusInterpolationVersion>1.1</plexusInterpolationVersion> <plexusPluginManagerVersion>1.0-alpha-1</plexusPluginManagerVersion> <plexusUtilsVersion>1.5.8</plexusUtilsVersion> <plexusJetty6Version>1.6</plexusJetty6Version> - <plexusWebdavVersion>1.0</plexusWebdavVersion> + <plexusWebdavVersion>1.0</plexusWebdavVersion> <wagonVersion>1.0-beta-4</wagonVersion> <modelBuilderVersion>1.7-SNAPSHOT</modelBuilderVersion> <mercuryVersion>1.0-alpha-6-SNAPSHOT</mercuryVersion> @@ -247,7 +247,7 @@ under the License. <module>maven-toolchain</module> <module>maven-compat</module> <module>maven-repository</module> - <module>maven-repository-mercury</module> + <module>maven-repository-mercury</module> </modules> <!--start--> <dependencies> @@ -366,11 +366,11 @@ under the License. </exclusion> </exclusions> </dependency> - + <!-- Plexus test dependencies --> <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-jetty6</artifactId> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-jetty6</artifactId> <version>${plexusJetty6Version}</version> <scope>test</scope> </dependency> @@ -380,7 +380,7 @@ under the License. <version>${plexusWebdavVersion}</version> <scope>test</scope> </dependency> - + <!-- Wagon --> <dependency> <groupId>org.apache.maven.wagon</groupId> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml index 4af8228..32124c5 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/pom.xml @@ -27,7 +27,7 @@ under the License. <version>0.1</version> <packaging>pom</packaging> - <name>Maven Integration Test :: MNG-3906</name> + <name>Maven Integration Test :: MNG-3906</name> <description> Test that project-level plugin dependencies are properly merged during inheritance. </description> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml index 43de398..e13262b 100644 --- a/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml +++ b/maven-core/src/test/projects/plugin-manager/project-with-plugin-classpath-ordering/sub/pom.xml @@ -30,7 +30,7 @@ under the License. <artifactId>child</artifactId> - <name>Maven Integration Test :: MNG-3906</name> + <name>Maven Integration Test :: MNG-3906</name> <description> Test that project-level plugin dependencies are properly merged during inheritance. </description> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/it0063/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/project-builder/it0063/pom.xml b/maven-core/src/test/projects/project-builder/it0063/pom.xml index b12cc70..0d7b08a 100644 --- a/maven-core/src/test/projects/project-builder/it0063/pom.xml +++ b/maven-core/src/test/projects/project-builder/it0063/pom.xml @@ -27,7 +27,7 @@ under the License. <version>1.0</version> <packaging>jar</packaging> - <name>Maven Integration Test :: it0063</name> + <name>Maven Integration Test :: it0063</name> <description>Test the use of a system scoped dependency to a (fake) tools.jar.</description> <dependencies> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml index 0de79bc..a70b208 100644 --- a/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml +++ b/maven-core/src/test/projects/project-builder/mng-3023/consumer/pom.xml @@ -30,7 +30,7 @@ under the License. <artifactId>consumer</artifactId> - <name>Maven Integration Test :: MNG-3023 :: Consumer</name> + <name>Maven Integration Test :: MNG-3023 :: Consumer</name> <description>Test that reactor projects are included in dependency resolution.</description> <dependencies> http://git-wip-us.apache.org/repos/asf/maven/blob/0343c526/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml ---------------------------------------------------------------------- diff --git a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml index 5290af2..e783f85 100644 --- a/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml +++ b/maven-core/src/test/projects/project-builder/mng-3023/dependency/pom.xml @@ -27,10 +27,10 @@ under the License. <artifactId>parent</artifactId> <version>1</version> </parent> - + <artifactId>dependency</artifactId> - <name>Maven Integration Test :: MNG-3023 :: Dependency</name> + <name>Maven Integration Test :: MNG-3023 :: Dependency</name> <description>Test that reactor projects are included in dependency resolution.</description> <build>
