You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2013/08/27 16:16:57 UTC
svn commit: r1517827 [17/24] - in /maven/plugins/trunk:
maven-acr-plugin/src/main/java/org/apache/maven/plugin/acr/
maven-ant-plugin/src/main/java/org/apache/maven/plugin/ant/
maven-ant-plugin/src/test/java/org/apache/maven/plugin/ant/stubs/
maven-antr...
Modified: maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/HelpUtilTest.java Tue Aug 27 14:16:42 2013
@@ -30,7 +30,6 @@ import java.util.Properties;
/**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
* @version $Id$
- *
*/
public class HelpUtilTest
extends AbstractMojoTestCase
@@ -44,21 +43,16 @@ public class HelpUtilTest
public void testGetMojoDescriptor()
throws Exception
{
- File testPom =
- new File( getBasedir(),
- "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" );
+ File testPom = new File( getBasedir(),
+ "src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" );
EvaluateMojo describe = (EvaluateMojo) lookupMojo( "evaluate", testPom );
- MavenSession session =
- new MavenSession(
- container,
- describe.settings, // Settings settings,
- describe.localRepository, // ArtifactRepository localRepository,
- null, // EventDispatcher eventDispatcher,
- null, // ReactorManager reactorManager,
- Arrays.asList("evaluate"),
- describe.project.getBasedir().toString(), new Properties(),
- Calendar.getInstance().getTime() );
+ MavenSession session = new MavenSession( container, describe.settings, // Settings settings,
+ describe.localRepository, // ArtifactRepository localRepository,
+ null, // EventDispatcher eventDispatcher,
+ null, // ReactorManager reactorManager,
+ Arrays.asList( "evaluate" ), describe.project.getBasedir().toString(),
+ new Properties(), Calendar.getInstance().getTime() );
HelpUtil.getMojoDescriptor( "help:evaluate", session, describe.project, "help:evaluate", true, false );
}
}
Modified: maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-help-plugin/src/test/java/org/apache/maven/plugins/help/stubs/DefaultMavenProjectStub.java Tue Aug 27 14:16:42 2013
@@ -43,9 +43,8 @@ public class DefaultMavenProjectStub
try
{
- model =
- pomReader.read( new FileReader( new File( getBasedir()
- + "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) ) );
+ model = pomReader.read( new FileReader( new File( getBasedir()
+ + "/src/test/resources/unit/default-configuration/default-configuration-plugin-config.xml" ) ) );
setModel( model );
}
catch ( Exception e )
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod1/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <artifactId>mod1</artifactId>
+ <artifactId>mod1</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod2/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,7 +29,7 @@ under the License.
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>mod2</artifactId>
+ <artifactId>mod2</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/pom-filtering-reactor/src/it/mod2-parent/mod3/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <artifactId>mod3</artifactId>
+ <artifactId>mod3</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-a/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
<relativePath>../parent</relativePath>
</parent>
- <artifactId>module-a</artifactId>
+ <artifactId>module-a</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/project-cloning-reactor/src/it/module-b/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
<relativePath>../parent</relativePath>
</parent>
- <artifactId>module-b</artifactId>
+ <artifactId>module-b</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/minvoker-70/1.0-SNAPSHOT/minvoker-70-1.0-20081020.164906-1.pom Tue Aug 27 14:16:42 2013
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.its</groupId>
<artifactId>parent-b</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>minvoker-70</artifactId>
+ <artifactId>minvoker-70</artifactId>
<packaging>jar</packaging>
<version>1.0-SNAPSHOT</version>
</project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-dependencies/repo/org/apache/maven/its/parent-b/0.1-SNAPSHOT/parent-b-0.1-20081020.164906-1.pom Tue Aug 27 14:16:42 2013
@@ -1,12 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.its</groupId>
<artifactId>parent-a</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
- <artifactId>parent-b</artifactId>
+ <artifactId>parent-b</artifactId>
<packaging>pom</packaging>
<version>0.1-SNAPSHOT</version>
</project>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod1/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +30,7 @@ under the License.
<relativePath>../mod1-parent</relativePath>
</parent>
- <artifactId>mod1</artifactId>
+ <artifactId>mod1</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/it/staging-reactor/mod2/pom.xml Tue Aug 27 14:16:42 2013
@@ -19,7 +19,8 @@ specific language governing permissions
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -28,7 +29,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>mod2</artifactId>
+ <artifactId>mod2</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Tue Aug 27 14:16:42 2013
@@ -365,7 +365,7 @@ public abstract class AbstractInvokerMoj
*/
@Component
private MavenProject project;
-
+
@Component
private MojoExecution mojoExecution;
@@ -373,11 +373,11 @@ public abstract class AbstractInvokerMoj
* A comma separated list of projectname patterns to run. Specify this parameter to run individual tests by file name,
* overriding the {@link #setupIncludes}, {@link #pomIncludes} and {@link #pomExcludes} parameters. Each pattern you
* specify here will be used to create an include/exclude pattern formatted like
- * <code>${projectsDirectory}/<i>pattern</i></code>. To exclude a test, prefix the pattern with a '<code>!</code>'.
+ * <code>${projectsDirectory}/<i>pattern</i></code>. To exclude a test, prefix the pattern with a '<code>!</code>'.
* So you can just type
- * <nobr><code>-Dinvoker.test=SimpleTest,Comp*Test,!Compare*</code></nobr> to run builds in
+ * <nobr><code>-Dinvoker.test=SimpleTest,Comp*Test,!Compare*</code></nobr> to run builds in
* <code>${projectsDirectory}/SimpleTest</code> and
- * <code>${projectsDirectory}/ComplexTest</code>, but not <code>${projectsDirectory}/CompareTest</code>
+ * <code>${projectsDirectory}/ComplexTest</code>, but not <code>${projectsDirectory}/CompareTest</code>
*
* @since 1.1 (exclusion since 1.8)
*/
@@ -425,13 +425,13 @@ public abstract class AbstractInvokerMoj
/**
* mavenExecutable can either be a file relative to <code>${maven.home}/bin/</code> or an absolute file.
- *
- * @since 1.8
+ *
* @see Invoker#setMavenExecutable(File)
+ * @since 1.8
*/
@Parameter( property = "invoker.mavenExecutable" )
private String mavenExecutable;
-
+
/**
* The <code>JAVA_HOME</code> environment variable to use for forked Maven invocations. Defaults to the current Java
* home directory.
@@ -538,7 +538,7 @@ public abstract class AbstractInvokerMoj
* # A comma separated list of Maven versions on which this build should be run.
* # Since plugin version 1.5
* invoker.maven.version = 2.0.10+, !2.1.0, !2.2.0
- *
+ *
* # A boolean value controlling the debug logging level of Maven, , defaults to "false"
* # Since plugin version 1.8
* invoker.debug = true
@@ -582,17 +582,19 @@ public abstract class AbstractInvokerMoj
/**
* Additional environment variables to set on the command line.
+ *
* @since 1.8
*/
@Parameter
- private Map<String, String> environmentVariables;
+ private Map<String, String> environmentVariables;
/**
* Additional variables for use in the hook scripts.
+ *
* @since 1.9
*/
@Parameter
- private Map<String, String> scriptVariables;
+ private Map<String, String> scriptVariables;
/**
* The scripter runner that is responsible to execute hook scripts.
@@ -610,7 +612,7 @@ public abstract class AbstractInvokerMoj
* The format for elapsed build time.
*/
private final DecimalFormat secFormat = new DecimalFormat( "(0.0 s)", new DecimalFormatSymbols( Locale.ENGLISH ) );
-
+
/**
* The version of Maven which is used to run the builds
*/
@@ -620,13 +622,13 @@ public abstract class AbstractInvokerMoj
* The version of the JRE which is used to run the builds
*/
private String actualJreVersion;
-
-
+
+
private void setActualJreVersion( String actualJreVersion )
{
this.actualJreVersion = actualJreVersion;
}
-
+
/**
* Invokes Maven on the configured test projects.
*
@@ -742,8 +744,9 @@ public abstract class AbstractInvokerMoj
processResults( new InvokerSession( buildJobs ) );
}
-
- protected void doFailIfNoProjects() throws MojoFailureException
+
+ protected void doFailIfNoProjects()
+ throws MojoFailureException
{
// should only be used during run and verify
}
@@ -1168,7 +1171,7 @@ public abstract class AbstractInvokerMoj
}
}
final File finalSettingsFile = mergedSettingsFile;
-
+
if ( mavenHome != null )
{
actualMavenVersion = SelectorUtils.getMavenVersion( mavenHome );
@@ -1177,7 +1180,7 @@ public abstract class AbstractInvokerMoj
{
actualMavenVersion = SelectorUtils.getMavenVersion();
}
-
+
if ( javaHome != null )
{
resolveExternalJreVersion();
@@ -1186,7 +1189,7 @@ public abstract class AbstractInvokerMoj
{
actualJreVersion = SelectorUtils.getJreVersion();
}
-
+
try
{
if ( isParallelRun() )
@@ -1275,7 +1278,8 @@ public abstract class AbstractInvokerMoj
try
{
ReflectionUtils.setVariableValueInObject( trackable, "sourceLevelSet", Boolean.FALSE );
- getLog().debug( "sourceLevelSet: " + ReflectionUtils.getValueIncludingSuperclasses( "sourceLevelSet", trackable ) );
+ getLog().debug(
+ "sourceLevelSet: " + ReflectionUtils.getValueIncludingSuperclasses( "sourceLevelSet", trackable ) );
}
catch ( IllegalAccessException e )
{
@@ -1287,14 +1291,14 @@ public abstract class AbstractInvokerMoj
{
Artifact pluginArtifact = mojoExecution.getMojoDescriptor().getPluginDescriptor().getPluginArtifact();
pluginArtifact.getFile();
-
+
Commandline commandLine = new Commandline();
commandLine.setExecutable( new File( javaHome, "bin/java" ).getAbsolutePath() );
commandLine.createArg().setValue( "-cp" );
commandLine.createArg().setFile( pluginArtifact.getFile() );
commandLine.createArg().setValue( SystemPropertyPrinter.class.getName() );
commandLine.createArg().setValue( "java.version" );
-
+
StreamConsumer consumer = new StreamConsumer()
{
public void consumeLine( String line )
@@ -1369,7 +1373,7 @@ public abstract class AbstractInvokerMoj
try
{
- int selection = getSelection( invokerProperties );
+ int selection = getSelection( invokerProperties );
if ( selection == 0 )
{
long milliseconds = System.currentTimeMillis();
@@ -1433,7 +1437,7 @@ public abstract class AbstractInvokerMoj
{
getLog().info( "..SKIPPED due to " + message.toString() );
}
-
+
// Abuse failureMessage, the field in the report which should contain the reason for skipping
// Consider skipCode + I18N
buildJob.setFailureMessage( "Skipped due to " + message.toString() );
@@ -1475,8 +1479,8 @@ public abstract class AbstractInvokerMoj
* Determines whether selector conditions of the specified invoker properties match the current environment.
*
* @param invokerProperties The invoker properties to check, must not be <code>null</code>.
- * @return <code>0</code> if the job corresponding to the properties should be run,
- * otherwise a bitwise value representing the reason why it should be skipped.
+ * @return <code>0</code> if the job corresponding to the properties should be run,
+ * otherwise a bitwise value representing the reason why it should be skipped.
*/
private int getSelection( InvokerProperties invokerProperties )
{
@@ -1619,7 +1623,7 @@ public abstract class AbstractInvokerMoj
request.setDebug( debug );
request.setShowVersion( showVersion );
-
+
if ( logger != null )
{
request.setErrorHandler( logger );
@@ -1632,7 +1636,7 @@ public abstract class AbstractInvokerMoj
invoker.setMavenHome( mavenHome );
request.addShellEnvironment( "M2_HOME", mavenHome.getAbsolutePath() );
}
-
+
if ( mavenExecutable != null )
{
invoker.setMavenExecutable( new File( mavenExecutable ) );
@@ -1642,7 +1646,7 @@ public abstract class AbstractInvokerMoj
{
request.setJavaHome( javaHome );
}
-
+
if ( environmentVariables != null )
{
for ( Map.Entry<String, String> variable : environmentVariables.entrySet() )
@@ -1776,7 +1780,7 @@ public abstract class AbstractInvokerMoj
throws MojoExecutionException
{
Properties collectedTestProperties = new Properties();
-
+
if ( testProperties != null )
{
collectedTestProperties.putAll( testProperties );
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/CompositeMap.java Tue Aug 27 14:16:42 2013
@@ -29,10 +29,10 @@ import org.codehaus.plexus.util.introspe
/**
* A map-like source to interpolate expressions.
- *
+ *
* @author Olivier Lamy
- * @since 1.1
* @version $Id$
+ * @since 1.1
*/
class CompositeMap
implements Map<String, Object>
@@ -50,10 +50,10 @@ class CompositeMap
/**
* Creates a new interpolation source backed by the specified Maven project and some user-specified properties.
- *
+ *
* @param mavenProject The Maven project from which to extract interpolated values, must not be <code>null</code>.
- * @param properties The set of additional properties from which to extract interpolated values, may be
- * <code>null</code>.
+ * @param properties The set of additional properties from which to extract interpolated values, may be
+ * <code>null</code>.
*/
protected CompositeMap( MavenProject mavenProject, Map<String, Object> properties )
{
@@ -67,7 +67,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#clear()
*/
public void clear()
@@ -77,7 +77,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#containsKey(java.lang.Object)
*/
public boolean containsKey( Object key )
@@ -109,7 +109,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#containsValue(java.lang.Object)
*/
public boolean containsValue( Object value )
@@ -119,7 +119,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#entrySet()
*/
public Set<Entry<String, Object>> entrySet()
@@ -129,7 +129,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#get(java.lang.Object)
*/
public Object get( Object key )
@@ -164,7 +164,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#isEmpty()
*/
public boolean isEmpty()
@@ -174,7 +174,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#keySet()
*/
public Set<String> keySet()
@@ -184,7 +184,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#put(java.lang.Object, java.lang.Object)
*/
public Object put( String key, Object value )
@@ -194,7 +194,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#putAll(java.util.Map)
*/
public void putAll( Map<? extends String, ? extends Object> t )
@@ -204,7 +204,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#remove(java.lang.Object)
*/
public Object remove( Object key )
@@ -214,7 +214,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#size()
*/
public int size()
@@ -224,7 +224,7 @@ class CompositeMap
/**
* {@inheritDoc}
- *
+ *
* @see java.util.Map#values()
*/
public Collection<Object> values()
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InstallMojo.java Tue Aug 27 14:16:42 2013
@@ -54,11 +54,11 @@ import org.codehaus.plexus.util.FileUtil
* Installs the project artifacts of the main build into the local repository as a preparation to run the sub projects.
* More precisely, all artifacts of the project itself, all its locally reachable parent POMs and all its dependencies
* from the reactor will be installed to the local repository.
- *
- * @since 1.2
+ *
* @author Paul Gier
* @author Benjamin Bentmann
* @version $Id$
+ * @since 1.2
*/
@Mojo( name = "install", defaultPhase = LifecyclePhase.PRE_INTEGRATION_TEST,
requiresDependencyResolution = ResolutionScope.RUNTIME, threadSafe = true )
@@ -132,18 +132,18 @@ public class InstallMojo
/**
* Extra dependencies that need to be installed on the local repository.<BR>
* Format:
- *
+ * <p/>
* <pre>
* groupId:artifactId:version:type:classifier
* </pre>
- *
+ * <p/>
* Examples:
- *
+ * <p/>
* <pre>
* org.apache.maven.plugins:maven-clean-plugin:2.4:maven-plugin
* org.apache.maven.plugins:maven-clean-plugin:2.4:jar:javadoc
* </pre>
- *
+ * <p/>
* If the type is 'maven-plugin' the plugin will try to resolve the artifact using plugin remote repositories,
* instead of using artifact remote repositories.
*
@@ -174,7 +174,7 @@ public class InstallMojo
/**
* Performs this mojo's tasks.
- *
+ *
* @throws MojoExecutionException If the artifacts could not be installed.
*/
public void execute()
@@ -203,7 +203,7 @@ public class InstallMojo
* custom repository will have the same identifier, layout and policies as the real local repository. That means
* apart from the location, the custom repository will be indistinguishable from the real repository such that its
* usage is transparent to the integration tests.
- *
+ *
* @return The local repository for the integration tests, never <code>null</code>.
* @throws MojoExecutionException If the repository could not be created.
*/
@@ -221,12 +221,11 @@ public class InstallMojo
throw new IOException( "Failed to create directory: " + localRepositoryPath );
}
- testRepository =
- repositoryFactory.createArtifactRepository( localRepository.getId(),
- localRepositoryPath.toURL().toExternalForm(),
- localRepository.getLayout(),
- localRepository.getSnapshots(),
- localRepository.getReleases() );
+ testRepository = repositoryFactory.createArtifactRepository( localRepository.getId(),
+ localRepositoryPath.toURL().toExternalForm(),
+ localRepository.getLayout(),
+ localRepository.getSnapshots(),
+ localRepository.getReleases() );
}
catch ( Exception e )
{
@@ -241,12 +240,12 @@ public class InstallMojo
* Installs the specified artifact to the local repository. Note: This method should only be used for artifacts that
* originate from the current (reactor) build. Artifacts that have been grabbed from the user's local repository
* should be installed to the test repository via {@link #copyArtifact(File, Artifact, ArtifactRepository)}.
- *
- * @param file The file associated with the artifact, must not be <code>null</code>. This is in most cases the value
- * of <code>artifact.getFile()</code> with the exception of the main artifact from a project with
- * packaging "pom". Projects with packaging "pom" have no main artifact file. They have however artifact
- * metadata (e.g. site descriptors) which needs to be installed.
- * @param artifact The artifact to install, must not be <code>null</code>.
+ *
+ * @param file The file associated with the artifact, must not be <code>null</code>. This is in most cases the value
+ * of <code>artifact.getFile()</code> with the exception of the main artifact from a project with
+ * packaging "pom". Projects with packaging "pom" have no main artifact file. They have however artifact
+ * metadata (e.g. site descriptors) which needs to be installed.
+ * @param artifact The artifact to install, must not be <code>null</code>.
* @param testRepository The local repository to install the artifact to, must not be <code>null</code>.
* @throws MojoExecutionException If the artifact could not be installed (e.g. has no associated file).
*/
@@ -285,9 +284,9 @@ public class InstallMojo
* from the user's local repository (and not the current build outputs). The subtle difference here is that
* artifacts from the repository have already undergone transformations and these manipulations should not be redone
* by the artifact installer. For this reason, this method performs plain copy operations to install the artifacts.
- *
- * @param file The file associated with the artifact, must not be <code>null</code>.
- * @param artifact The artifact to install, must not be <code>null</code>.
+ *
+ * @param file The file associated with the artifact, must not be <code>null</code>.
+ * @param artifact The artifact to install, must not be <code>null</code>.
* @param testRepository The local repository to install the artifact to, must not be <code>null</code>.
* @throws MojoExecutionException If the artifact could not be installed (e.g. has no associated file).
*/
@@ -338,8 +337,8 @@ public class InstallMojo
/**
* Installs the main artifact and any attached artifacts of the specified project to the local repository.
- *
- * @param mvnProject The project whose artifacts should be installed, must not be <code>null</code>.
+ *
+ * @param mvnProject The project whose artifacts should be installed, must not be <code>null</code>.
* @param testRepository The local repository to install the artifacts to, must not be <code>null</code>.
* @throws MojoExecutionException If any artifact could not be installed.
*/
@@ -374,8 +373,8 @@ public class InstallMojo
/**
* Installs the (locally reachable) parent POMs of the specified project to the local repository. The parent POMs
* from the reactor must be installed or the forked IT builds will fail when using a clean repository.
- *
- * @param mvnProject The project whose parent POMs should be installed, must not be <code>null</code>.
+ *
+ * @param mvnProject The project whose parent POMs should be installed, must not be <code>null</code>.
* @param testRepository The local repository to install the POMs to, must not be <code>null</code>.
* @throws MojoExecutionException If any POM could not be installed.
*/
@@ -402,8 +401,8 @@ public class InstallMojo
/**
* Installs the POM of the specified project to the local repository.
- *
- * @param mvnProject The project whose POM should be installed, must not be <code>null</code>.
+ *
+ * @param mvnProject The project whose POM should be installed, must not be <code>null</code>.
* @param testRepository The local repository to install the POM to, must not be <code>null</code>.
* @throws MojoExecutionException If the POM could not be installed.
*/
@@ -434,10 +433,10 @@ public class InstallMojo
/**
* Installs the dependent projects from the reactor to the local repository. The dependencies on other modules from
* the reactor must be installed or the forked IT builds will fail when using a clean repository.
- *
- * @param mvnProject The project whose dependent projects should be installed, must not be <code>null</code>.
+ *
+ * @param mvnProject The project whose dependent projects should be installed, must not be <code>null</code>.
* @param reactorProjects The set of projects in the reactor build, must not be <code>null</code>.
- * @param testRepository The local repository to install the POMs to, must not be <code>null</code>.
+ * @param testRepository The local repository to install the POMs to, must not be <code>null</code>.
* @throws MojoExecutionException If any dependency could not be installed.
*/
private void installProjectDependencies( MavenProject mvnProject, Collection<MavenProject> reactorProjects,
@@ -449,7 +448,7 @@ public class InstallMojo
// ... into dependencies that were resolved from reactor projects ...
Collection<String> dependencyProjects = new LinkedHashSet<String>();
-
+
// index available reactor projects
Map<String, MavenProject> projects = new HashMap<String, MavenProject>();
for ( MavenProject reactorProject : reactorProjects )
@@ -458,7 +457,7 @@ public class InstallMojo
reactorProject.getGroupId() + ':' + reactorProject.getArtifactId() + ':' + reactorProject.getVersion();
projects.put( projectId, reactorProject );
-
+
// only add projects of reactor build previous to this mvnProject
if ( !( foundCurrent |= ( mvnProject.equals( reactorProject ) ) ) )
{
@@ -470,7 +469,7 @@ public class InstallMojo
Collection<Artifact> artifacts = (Collection<Artifact>) mvnProject.getArtifacts();
// ... and those that were resolved from the (local) repo
Collection<Artifact> dependencyArtifacts = new LinkedHashSet<Artifact>();
-
+
for ( Artifact artifact : artifacts )
{
// workaround for MNG-2961 to ensure the base version does not contain a timestamp
@@ -526,9 +525,8 @@ public class InstallMojo
private void copyPoms( Artifact artifact, ArtifactRepository testRepository )
throws MojoExecutionException
{
- Artifact pomArtifact =
- artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
- artifact.getBaseVersion() );
+ Artifact pomArtifact = artifactFactory.createProjectArtifact( artifact.getGroupId(), artifact.getArtifactId(),
+ artifact.getBaseVersion() );
File pomFile = new File( localRepository.getBasedir(), localRepository.pathOf( pomArtifact ) );
@@ -541,8 +539,8 @@ public class InstallMojo
/**
* Installs all parent POMs of the specified POM file that are available in the local repository.
- *
- * @param pomFile The path to the POM file whose parents should be installed, must not be <code>null</code>.
+ *
+ * @param pomFile The path to the POM file whose parents should be installed, must not be <code>null</code>.
* @param testRepository The local repository to install the POMs to, must not be <code>null</code>.
* @throws MojoExecutionException If any (existing) parent POM could not be installed.
*/
@@ -559,10 +557,10 @@ public class InstallMojo
/**
* Installs the specified POM and all its parent POMs to the local repository.
- *
- * @param groupId The group id of the POM which should be installed, must not be <code>null</code>.
- * @param artifactId The artifact id of the POM which should be installed, must not be <code>null</code>.
- * @param version The version of the POM which should be installed, must not be <code>null</code>.
+ *
+ * @param groupId The group id of the POM which should be installed, must not be <code>null</code>.
+ * @param artifactId The artifact id of the POM which should be installed, must not be <code>null</code>.
+ * @param version The version of the POM which should be installed, must not be <code>null</code>.
* @param testRepository The local repository to install the POMs to, must not be <code>null</code>.
* @throws MojoExecutionException If any (existing) parent POM could not be installed.
*/
@@ -595,10 +593,12 @@ public class InstallMojo
Artifact originatingArtifact = project.getArtifact();
- for (String extraArtifact : extraArtifacts) {
- String[] gav = extraArtifact.split(":");
- if (gav.length < 3 || gav.length > 5) {
- throw new MojoExecutionException("Invalid artifact " + extraArtifact);
+ for ( String extraArtifact : extraArtifacts )
+ {
+ String[] gav = extraArtifact.split( ":" );
+ if ( gav.length < 3 || gav.length > 5 )
+ {
+ throw new MojoExecutionException( "Invalid artifact " + extraArtifact );
}
String groupId = gav[0];
@@ -606,42 +606,53 @@ public class InstallMojo
String version = gav[2];
String type = "jar";
- if (gav.length > 3) {
+ if ( gav.length > 3 )
+ {
type = gav[3];
}
String classifier = null;
- if (gav.length == 5) {
+ if ( gav.length == 5 )
+ {
classifier = gav[4];
}
List<ArtifactRepository> remoteRepositories;
- if ("maven-plugin".equals(type)) {
+ if ( "maven-plugin".equals( type ) )
+ {
remoteRepositories = this.remotePluginRepositories;
- } else {
+ }
+ else
+ {
remoteRepositories = this.remoteArtifactRepositories;
}
Artifact artifact = null;
- try {
- artifact = artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
+ try
+ {
+ artifact =
+ artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
ArtifactResolutionResult arr =
- resolver.resolveTransitively(Collections.singleton(artifact), originatingArtifact,
- remoteRepositories, localRepository, artifactMetadataSource);
+ resolver.resolveTransitively( Collections.singleton( artifact ), originatingArtifact,
+ remoteRepositories, localRepository, artifactMetadataSource );
- if (!groupId.equals(artifact.getGroupId()) || !artifactId.equals(artifact.getArtifactId())
- || !version.equals(artifact.getVersion())) {
+ if ( !groupId.equals( artifact.getGroupId() ) || !artifactId.equals( artifact.getArtifactId() )
+ || !version.equals( artifact.getVersion() ) )
+ {
artifact =
- artifactFactory.createArtifactWithClassifier(groupId, artifactId, version, type, classifier);
- copyPoms(artifact, testRepository);
+ artifactFactory.createArtifactWithClassifier( groupId, artifactId, version, type, classifier );
+ copyPoms( artifact, testRepository );
}
- for (Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts()) {
- copyArtifact(arrArtifact, testRepository);
+ for ( Artifact arrArtifact : (Set<Artifact>) arr.getArtifacts() )
+ {
+ copyArtifact( arrArtifact, testRepository );
}
- } catch (Exception e) {
- throw new MojoExecutionException("Unable to resolve dependencies for: " + artifact, e);
+ }
+ catch ( Exception e )
+ {
+ throw new MojoExecutionException( "Unable to resolve dependencies for: " + artifact, e );
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java Tue Aug 27 14:16:42 2013
@@ -29,7 +29,7 @@ import org.codehaus.plexus.util.StringUt
/**
* Provides a convenient facade around the <code>invoker.properties</code>.
- *
+ *
* @author Benjamin Bentmann
* @version $Id$
*/
@@ -41,26 +41,27 @@ class InvokerProperties
PROJECT( "invoker.project" ),
GOALS( "invoker.goals" ),
PROFILES( "invoker.profiles" ),
- MAVEN_OPTS ( "invoker.mavenOpts" ),
+ MAVEN_OPTS( "invoker.mavenOpts" ),
FAILURE_BEHAVIOR( "invoker.failureBehavior" ),
NON_RECURSIVE( "invoker.nonRecursive" ),
OFFLINE( "invoker.offline" ),
SYSTEM_PROPERTIES_FILE( "invoker.systemPropertiesFile" ),
DEBUG( "invoker.debug" );
-
+
private final String key;
-
- private InvocationProperty(final String s)
+
+ private InvocationProperty( final String s )
{
this.key = s;
}
@Override
- public String toString() {
+ public String toString()
+ {
return key;
}
}
-
+
/**
* The invoker properties being wrapped.
*/
@@ -69,7 +70,7 @@ class InvokerProperties
/**
* Creates a new facade for the specified invoker properties. The properties will not be copied, so any changes to
* them will be reflected by the facade.
- *
+ *
* @param properties The invoker properties to wrap, may be <code>null</code> if none.
*/
public InvokerProperties( Properties properties )
@@ -79,7 +80,7 @@ class InvokerProperties
/**
* Gets the invoker properties being wrapped.
- *
+ *
* @return The invoker properties being wrapped, never <code>null</code>.
*/
public Properties getProperties()
@@ -89,7 +90,7 @@ class InvokerProperties
/**
* Gets the name of the corresponding build job.
- *
+ *
* @return The name of the build job or an empty string if not set.
*/
public String getJobName()
@@ -99,7 +100,7 @@ class InvokerProperties
/**
* Gets the description of the corresponding build job.
- *
+ *
* @return The description of the build job or an empty string if not set.
*/
public String getJobDescription()
@@ -109,7 +110,7 @@ class InvokerProperties
/**
* Gets the specification of JRE versions on which this build job should be run.
- *
+ *
* @return The specification of JRE versions or an empty string if not set.
*/
public String getJreVersion()
@@ -130,7 +131,7 @@ class InvokerProperties
/**
* Gets the specification of OS families on which this build job should be run.
- *
+ *
* @return The specification of OS families or an empty string if not set.
*/
public String getOsFamily()
@@ -140,7 +141,7 @@ class InvokerProperties
/**
* Determines whether these invoker properties contain a build definition for the specified invocation index.
- *
+ *
* @param index The one-based index of the invocation to check for, must not be negative.
* @return <code>true</code> if the invocation with the specified index is defined, <code>false</code> otherwise.
*/
@@ -159,9 +160,9 @@ class InvokerProperties
/**
* Configures the specified invocation request from these invoker properties. Settings not present in the invoker
* properties will be left unchanged in the invocation request.
- *
+ *
* @param request The invocation request to configure, must not be <code>null</code>.
- * @param index The one-based index of the invocation to configure, must not be negative.
+ * @param index The one-based index of the invocation to configure, must not be negative.
*/
public void configureInvocation( InvocationRequest request, int index )
{
@@ -190,7 +191,8 @@ class InvokerProperties
String profiles = get( InvocationProperty.PROFILES, index );
if ( profiles != null )
{
- request.setProfiles( new ArrayList<String>( Arrays.asList( StringUtils.split( profiles, ", \t\n\r\f" ) ) ) );
+ request.setProfiles(
+ new ArrayList<String>( Arrays.asList( StringUtils.split( profiles, ", \t\n\r\f" ) ) ) );
}
String mvnOpts = get( InvocationProperty.MAVEN_OPTS, index );
@@ -208,27 +210,27 @@ class InvokerProperties
String nonRecursive = get( InvocationProperty.NON_RECURSIVE, index );
if ( nonRecursive != null )
{
- request.setRecursive( !Boolean.valueOf(nonRecursive));
+ request.setRecursive( !Boolean.valueOf( nonRecursive ) );
}
String offline = get( InvocationProperty.OFFLINE, index );
if ( offline != null )
{
- request.setOffline(Boolean.valueOf(offline));
+ request.setOffline( Boolean.valueOf( offline ) );
}
-
+
String debug = get( InvocationProperty.DEBUG, index );
if ( debug != null )
{
- request.setDebug(Boolean.valueOf(debug));
+ request.setDebug( Boolean.valueOf( debug ) );
}
}
/**
* Checks whether the specified exit code matches the one expected for the given invocation.
- *
+ *
* @param exitCode The exit code of the Maven invocation to check.
- * @param index The index of the invocation for which to check the exit code, must not be negative.
+ * @param index The index of the invocation for which to check the exit code, must not be negative.
* @return <code>true</code> if the exit code is zero and a success was expected or if the exit code is non-zero and
* a failue was expected, <code>false</code> otherwise.
*/
@@ -240,7 +242,7 @@ class InvokerProperties
/**
* Gets the path to the properties file used to set the system properties for the specified invocation.
- *
+ *
* @param index The index of the invocation for which to check the exit code, must not be negative.
* @return The path to the properties file or <code>null</code> if not set.
*/
@@ -254,8 +256,8 @@ class InvokerProperties
* for multiple builds of the same project. For this reason, the properties are indexed. First, a property named
* <code>key.index</code> will be queried. If this property does not exist, the value of the property named
* <code>key</code> will finally be returned.
- *
- * @param key The (base) key for the invoker property to lookup, must not be <code>null</code>.
+ *
+ * @param key The (base) key for the invoker property to lookup, must not be <code>null</code>.
* @param index The index of the invocation for which to retrieve the value, must not be negative.
* @return The value for the requested invoker property or <code>null</code> if not defined.
*/
@@ -276,6 +278,6 @@ class InvokerProperties
private String get( InvocationProperty prop, int index )
{
- return get( prop.toString(), index);
+ return get( prop.toString(), index );
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/MetadataUtils.java Tue Aug 27 14:16:42 2013
@@ -42,7 +42,7 @@ import org.codehaus.plexus.util.xml.pull
/**
* Provides utility methods for artifact metadata processing.
- *
+ *
* @author Benjamin Bentmann
*/
class MetadataUtils
@@ -52,8 +52,8 @@ class MetadataUtils
* Creates local metadata files for the specified artifact. The goal is to simulate the installation of the artifact
* by a local build, thereby decoupling the forked builds from the inderministic collection of remote repositories
* that are available to the main build and from which the artifact was originally resolved.
- *
- * @param file The artifact's file in the local test repository, must not be <code>null</code>.
+ *
+ * @param file The artifact's file in the local test repository, must not be <code>null</code>.
* @param artifact The artifact to create metadata for, must not be <code>null</code>.
* @throws IOException If the metadata could not be created.
*/
@@ -98,8 +98,9 @@ class MetadataUtils
{
Xpp3Dom[] children = versions.getChildren( "version" );
- for (Xpp3Dom aChildren : children) {
- allVersions.add(aChildren.getValue());
+ for ( Xpp3Dom aChildren : children )
+ {
+ allVersions.add( aChildren.getValue() );
}
}
}
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/SelectorUtils.java Tue Aug 27 14:16:42 2013
@@ -46,13 +46,17 @@ class SelectorUtils
{
String[] tokens = ( list != null ) ? StringUtils.split( list, "," ) : new String[0];
- for (String token1 : tokens) {
+ for ( String token1 : tokens )
+ {
String token = token1.trim();
- if (token.startsWith("!")) {
- excludes.add(token.substring(1));
- } else {
- includes.add(token);
+ if ( token.startsWith( "!" ) )
+ {
+ excludes.add( token.substring( 1 ) );
+ }
+ else
+ {
+ includes.add( token );
}
}
}
@@ -88,6 +92,7 @@ class SelectorUtils
/**
* Retrieves the current Maven version.
+ *
* @return The current Maven version.
*/
static String getMavenVersion()
@@ -108,7 +113,7 @@ class SelectorUtils
return null;
}
}
-
+
static String getMavenVersion( File mavenHome )
{
File mavenLib = new File( mavenHome, "lib" );
@@ -124,10 +129,8 @@ class SelectorUtils
{
try
{
- @SuppressWarnings( "deprecation" )
- URL url =
- new URL( "jar:" + file.toURL().toExternalForm()
- + "!/META-INF/maven/org.apache.maven/maven-core/pom.properties" );
+ @SuppressWarnings( "deprecation" ) URL url = new URL( "jar:" + file.toURL().toExternalForm()
+ + "!/META-INF/maven/org.apache.maven/maven-core/pom.properties" );
Properties properties = new Properties();
properties.load( url.openStream() );
@@ -153,7 +156,7 @@ class SelectorUtils
{
return isMavenVersion( mavenSpec, getMavenVersion() );
}
-
+
static boolean isMavenVersion( String mavenSpec, String actualVersion )
{
List<String> includes = new ArrayList<String>();
@@ -169,7 +172,7 @@ class SelectorUtils
{
return System.getProperty( "java.version", "" );
}
-
+
static String getJreVersion( File javaHome )
{
//@todo detect actual version
@@ -180,7 +183,7 @@ class SelectorUtils
{
return isJreVersion( jreSpec, getJreVersion() );
}
-
+
static boolean isJreVersion( String jreSpec, String actualJreVersion )
{
List<String> includes = new ArrayList<String>();
@@ -243,8 +246,9 @@ class SelectorUtils
List<Integer> numbers = new ArrayList<Integer>();
- for (String token : tokens) {
- numbers.add(Integer.valueOf(token));
+ for ( String token : tokens )
+ {
+ numbers.add( Integer.valueOf( token ) );
}
return numbers;
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InterpolationTest.java Tue Aug 27 14:16:42 2013
@@ -34,8 +34,8 @@ import org.codehaus.plexus.util.ReaderFa
/**
* @author Olivier Lamy
- * @since 22 nov. 07
* @version $Id$
+ * @since 22 nov. 07
*/
public class InterpolationTest
extends AbstractMojoTestCase
@@ -82,8 +82,9 @@ public class InterpolationTest
properties.put( "cleanProps", "clean" );
properties.put( "version", "2.0-SNAPSHOT" );
setVariableValueToObject( invokerMojo, "interpolationsProperties", properties );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test"
- + File.separatorChar + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "interpolation";
List<String> goals = invokerMojo.getGoals( new File( dirPath ) );
assertEquals( goals.toString(), 2, goals.size() );
assertEquals( "clean", goals.get( 0 ) );
@@ -105,9 +106,10 @@ public class InterpolationTest
properties.put( "foo", "bar" );
properties.put( "version", "2.0-SNAPSHOT" );
setVariableValueToObject( invokerMojo, "interpolationsProperties", properties );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test"
- + File.separatorChar + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
-
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
+ + "resources" + File.separatorChar + "unit" + File.separatorChar + "interpolation";
+
interpolatedPomFile = new File( getBasedir(), "target/interpolated-pom.xml" );
invokerMojo.buildInterpolatedFile( new File( dirPath, "pom.xml" ), interpolatedPomFile );
reader = ReaderFactory.newXmlReader( interpolatedPomFile );
@@ -134,8 +136,9 @@ public class InterpolationTest
setVariableValueToObject( invokerMojo, "project", buildMavenProjectStub() );
setVariableValueToObject( invokerMojo, "profilesFile", "profiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertEquals( 2, profiles.size() );
assertTrue( profiles.contains( "foo" ) );
@@ -147,11 +150,12 @@ public class InterpolationTest
InvokerMojo invokerMojo = new InvokerMojo();
setVariableValueToObject( invokerMojo, "project", buildMavenProjectStub() );
- setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
+ setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( "zloug" ) );
setVariableValueToObject( invokerMojo, "profilesFile", "emptyProfiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertFalse( profiles.contains( "zloug" ) );
assertEquals( 0, profiles.size() );
@@ -163,11 +167,12 @@ public class InterpolationTest
{
InvokerMojo invokerMojo = new InvokerMojo();
- setVariableValueToObject( invokerMojo, "profiles", Arrays.asList("zloug") );
+ setVariableValueToObject( invokerMojo, "profiles", Arrays.asList( "zloug" ) );
setVariableValueToObject( invokerMojo, "profilesFile", "zorglubProfiles.txt" );
setVariableValueToObject( invokerMojo, "settings", new Settings() );
- String dirPath = getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar
- + "resources" + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
+ String dirPath =
+ getBasedir() + File.separatorChar + "src" + File.separatorChar + "test" + File.separatorChar + "resources"
+ + File.separatorChar + "unit" + File.separatorChar + "profiles-from-file";
List<String> profiles = invokerMojo.getProfiles( new File( dirPath ) );
assertTrue( profiles.contains( "zloug" ) );
assertEquals( 1, profiles.size() );
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignMojo.java Tue Aug 27 14:16:42 2013
@@ -272,8 +272,9 @@ public class JarSignMojo
addArgIf( arguments, alias != null, this.alias );
- for (Object argument : arguments) {
- commandLine.createArgument().setValue(argument.toString());
+ for ( Object argument : arguments )
+ {
+ commandLine.createArgument().setValue( argument.toString() );
}
commandLine.setWorkingDirectory( workingDirectory.getAbsolutePath() );
@@ -321,7 +322,7 @@ public class JarSignMojo
if ( result != 0 )
{
throw new MojoExecutionException( "Result of " + purgePassword( commandLine ) +
- " execution is: \'" + result + "\'." );
+ " execution is: \'" + result + "\'." );
}
}
catch ( CommandLineException e )
@@ -348,7 +349,7 @@ public class JarSignMojo
private String purgePassword( Commandline commandLine )
{
String out = commandLine.toString();
- if ( keypass != null && out.contains(keypass))
+ if ( keypass != null && out.contains( keypass ) )
{
out = StringUtils.replace( out, keypass, "******" );
}
@@ -439,7 +440,7 @@ public class JarSignMojo
* @param arguments
* @param key the argument name.
* @param value the argument value to be added.
- * @see #addArgIfNotEmpty(java.util.List,String,Object,boolean)
+ * @see #addArgIfNotEmpty(java.util.List, String, Object, boolean)
*/
private void addArgIfNotEmpty( List arguments, String key, Object value )
{
Modified: maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java (original)
+++ maven/plugins/trunk/maven-jar-plugin/src/main/java/org/apache/maven/plugin/jar/JarSignVerifyMojo.java Tue Aug 27 14:16:42 2013
@@ -102,7 +102,7 @@ public class JarSignVerifyMojo
/**
* Is the jar signed ? output property set by the execute call. The value will be accessible
* when execute() ends and if errorWhenNotSigned has been set to false.
- **/
+ */
private boolean signed;
File getJarFile()
@@ -113,7 +113,7 @@ public class JarSignVerifyMojo
}
else
{
- return AbstractJarMojo.getJarFile( basedir, finalName, null);
+ return AbstractJarMojo.getJarFile( basedir, finalName, null );
}
}
@@ -133,33 +133,32 @@ public class JarSignVerifyMojo
arguments.add( getJarFile() );
- for (Object argument : arguments) {
- commandLine.createArgument().setValue(argument.toString());
+ for ( Object argument : arguments )
+ {
+ commandLine.createArgument().setValue( argument.toString() );
}
commandLine.setWorkingDirectory( workingDirectory.getAbsolutePath() );
- getLog().debug("Executing: " + commandLine );
+ getLog().debug( "Executing: " + commandLine );
LineMatcherStreamConsumer outConsumer = new LineMatcherStreamConsumer( "jar verified." );
StreamConsumer errConsumer = new StreamConsumer()
{
- public void consumeLine(String line)
+ public void consumeLine( String line )
{
- getLog().warn( line );
+ getLog().warn( line );
}
};
-
try
{
int result = executeCommandLine( commandLine, null, outConsumer, errConsumer );
if ( result != 0 )
{
- throw new MojoExecutionException("Result of " + commandLine
- + " execution is: \'" + result + "\'." );
+ throw new MojoExecutionException( "Result of " + commandLine + " execution is: \'" + result + "\'." );
}
signed = outConsumer.matched;
@@ -181,19 +180,21 @@ public class JarSignVerifyMojo
implements StreamConsumer
{
private String toMatch;
+
private boolean matched;
+
private String firstOutLine;
LineMatcherStreamConsumer( String toMatch )
{
- this.toMatch = toMatch;
+ this.toMatch = toMatch;
}
- public void consumeLine(String line)
+ public void consumeLine( String line )
{
if ( firstOutLine == null )
{
- firstOutLine = line;
+ firstOutLine = line;
}
matched = matched || toMatch.equals( line );
@@ -201,7 +202,7 @@ public class JarSignVerifyMojo
}
}
- // taken from JavadocReport then slightly refactored
+ // taken from JavadocReport then slightly refactored
// should probably share with other plugins that use $JAVA_HOME/bin tools
/**
@@ -216,7 +217,7 @@ public class JarSignVerifyMojo
private static String getJDKCommandPath( String command, Log logger )
{
- String path = getJDKCommandExe(command).getAbsolutePath();
+ String path = getJDKCommandExe( command ).getAbsolutePath();
logger.debug( command + " executable=[" + path + "]" );
return path;
}
@@ -244,7 +245,6 @@ public class JarSignVerifyMojo
return exe;
}
-
// Helper methods. Could/should be shared e.g. with JavadocReport
/**
@@ -252,8 +252,8 @@ public class JarSignVerifyMojo
* conditionally based on the given flag.
*
* @param arguments
- * @param b the flag which controls if the argument is added or not.
- * @param value the argument value to be added.
+ * @param b the flag which controls if the argument is added or not.
+ * @param value the argument value to be added.
*/
private void addArgIf( List arguments, boolean b, String value )
{
@@ -266,13 +266,13 @@ public class JarSignVerifyMojo
/**
* Convenience method to add an argument to the <code>command line</code>
* if the the value is not null or empty.
- * <p>
+ * <p/>
* Moreover, the value could be comma separated.
*
* @param arguments
- * @param key the argument name.
- * @param value the argument value to be added.
- * @see #addArgIfNotEmpty(java.util.List,String,String,boolean)
+ * @param key the argument name.
+ * @param value the argument value to be added.
+ * @see #addArgIfNotEmpty(java.util.List, String, String, boolean)
*/
private void addArgIfNotEmpty( List arguments, String key, String value )
{
@@ -282,12 +282,12 @@ public class JarSignVerifyMojo
/**
* Convenience method to add an argument to the <code>command line</code>
* if the the value is not null or empty.
- * <p>
+ * <p/>
* Moreover, the value could be comma separated.
*
* @param arguments
- * @param key the argument name.
- * @param value the argument value to be added.
+ * @param key the argument name.
+ * @param value the argument value to be added.
* @param repeatKey repeat or not the key in the command line
*/
private void addArgIfNotEmpty( List arguments, String key, String value, boolean repeatKey )
@@ -318,8 +318,8 @@ public class JarSignVerifyMojo
// methods used for tests purposes - allow mocking and simulate automatic setters
//
- protected int executeCommandLine( Commandline commandLine, InputStream inputStream,
- StreamConsumer systemOut, StreamConsumer systemErr )
+ protected int executeCommandLine( Commandline commandLine, InputStream inputStream, StreamConsumer systemOut,
+ StreamConsumer systemErr )
throws CommandLineException
{
return CommandLineUtils.executeCommandLine( commandLine, inputStream, systemOut, systemErr );
Modified: maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java (original)
+++ maven/plugins/trunk/maven-jarsigner-plugin/src/main/java/org/apache/maven/plugins/jarsigner/AbstractJarsignerMojo.java Tue Aug 27 14:16:42 2013
@@ -206,18 +206,21 @@ public abstract class AbstractJarsignerM
excludes.addAll( Arrays.asList( excludeClassifiers ) );
}
- for (Object o : this.project.getAttachedArtifacts()) {
+ for ( Object o : this.project.getAttachedArtifacts() )
+ {
final Artifact artifact = (Artifact) o;
- if (!includes.isEmpty() && !includes.contains(artifact.getClassifier())) {
+ if ( !includes.isEmpty() && !includes.contains( artifact.getClassifier() ) )
+ {
continue;
}
- if (excludes.contains(artifact.getClassifier())) {
+ if ( excludes.contains( artifact.getClassifier() ) )
+ {
continue;
}
- processed += processArtifact(artifact) ? 1 : 0;
+ processed += processArtifact( artifact ) ? 1 : 0;
}
}
else
@@ -248,16 +251,17 @@ public abstract class AbstractJarsignerM
"Failed to scan archive directory for JARs: " + e.getMessage(), e );
}
- for (Object jarFile1 : jarFiles) {
+ for ( Object jarFile1 : jarFiles )
+ {
File jarFile = (File) jarFile1;
- processArchive(jarFile);
+ processArchive( jarFile );
processed++;
}
}
}
- getLog().info( getMessage( "processed", processed) );
+ getLog().info( getMessage( "processed", processed ) );
}
else
{
@@ -398,7 +402,7 @@ public abstract class AbstractJarsignerM
if ( resultCode != 0 )
{
throw new MojoExecutionException(
- getMessage( "failure", getCommandlineInfo( commandLine ), resultCode) );
+ getMessage( "failure", getCommandlineInfo( commandLine ), resultCode ) );
}
}
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-a/pom.xml Tue Aug 27 14:16:42 2013
@@ -28,7 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <artifactId>MJAVADOC-275-mod-a</artifactId>
+ <artifactId>MJAVADOC-275-mod-a</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-b/pom.xml Tue Aug 27 14:16:42 2013
@@ -28,7 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <artifactId>MJAVADOC-275-mod-b</artifactId>
+ <artifactId>MJAVADOC-275-mod-b</artifactId>
<version>0.1</version>
<packaging>jar</packaging>
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml?rev=1517827&r1=1517826&r2=1517827&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/it/MJAVADOC-275/mod-c/pom.xml Tue Aug 27 14:16:42 2013
@@ -28,7 +28,7 @@ under the License.
<version>0.1</version>
</parent>
- <artifactId>MJAVADOC-275-mod-c</artifactId>
+ <artifactId>MJAVADOC-275-mod-c</artifactId>
<version>0.1</version>
<packaging>jar</packaging>