Author: jdcasey
Date: Tue Jun 9 20:17:25 2009
New Revision: 783123
URL: http://svn.apache.org/viewvc?rev=783123&view=rev
Log:
[MNG-4143] Shield the user from stacktrace in the event they use JDK < 1.5
Added:
maven/components/branches/maven-2.2.0-RC/maven-cli/
maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml
maven/components/branches/maven-2.2.0-RC/maven-cli/src/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
- copied, changed from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
Removed:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java
Modified:
maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
maven/components/branches/maven-2.2.0-RC/build.xml
maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
maven/components/branches/maven-2.2.0-RC/pom.xml
Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/pom.xml Tue Jun 9
20:17:25 2009
@@ -146,6 +146,10 @@
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-cli</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
</dependency>
<dependency>
Modified: maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf
(original)
+++ maven/components/branches/maven-2.2.0-RC/apache-maven/src/bin/m2.conf Tue
Jun 9 20:17:25 2009
@@ -1,4 +1,4 @@
-main is org.apache.maven.cli.MavenCli from plexus.core
+main is org.apache.maven.cli.Main from plexus.core
set maven.home default ${user.home}/m2
Modified: maven/components/branches/maven-2.2.0-RC/build.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/build.xml?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/build.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/build.xml Tue Jun 9 20:17:25 2009
@@ -184,7 +184,7 @@
</target>
<target name="maven-compile" depends="compile-boot" description="compiles
Maven using the bootstrap Maven, skipping automated tests">
- <java fork="true" classname="org.apache.maven.cli.MavenCli"
failonerror="true">
+ <java fork="true" classname="org.apache.maven.cli.Main" failonerror="true">
<jvmarg value="-Xmx256M"/>
<!-- <jvmarg value="-Xdebug"/>
Added: maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml?rev=783123&view=auto
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml (added)
+++ maven/components/branches/maven-2.2.0-RC/maven-cli/pom.xml Tue Jun 9
20:17:25 2009
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding 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 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/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven</artifactId>
+ <version>2.2.0-RC3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>maven-cli</artifactId>
+
+ <name>Maven Command-Line Interface</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/AbstractConsoleDownloadMonitor.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/BatchModeDownloadMonitor.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/CLIManager.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/CLIManager.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/ConsoleDownloadMonitor.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Added:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java?rev=783123&view=auto
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
(added)
+++
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/Main.java
Tue Jun 9 20:17:25 2009
@@ -0,0 +1,42 @@
+package org.apache.maven.cli;
+
+import org.codehaus.classworlds.ClassWorld;
+
+/**
+ * Main class used to shield the user from the rest of Maven in the event the
user is using JDK < 1.5.
+ *
+ * @since 2.2.0
+ */
+public class Main
+{
+
+ public static void main( String[] args )
+ {
+ ClassWorld classWorld = new ClassWorld( "plexus.core",
Thread.currentThread().getContextClassLoader() );
+
+ int result = main( args, classWorld );
+
+ System.exit( result );
+ }
+
+ /**
+ * @noinspection ConfusingMainMethod
+ */
+ public static int main( String[] args, ClassWorld classWorld )
+ {
+ //
----------------------------------------------------------------------
+ // Setup the command line parser
+ //
----------------------------------------------------------------------
+
+ String javaVersion = System.getProperty( "java.specification.version",
"1.5" );
+ System.out.println( "Java specification version: " + javaVersion );
+
+ if ( "1.3".equals( javaVersion ) || "1.4".equals( javaVersion ) )
+ {
+ System.err.println( "This release of Maven requires Java version
1.5 or greater." );
+ return 1;
+ }
+
+ return MavenCli.main( args, classWorld );
+ }
+}
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/cli/MavenCli.java
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-cli/src/main/java/org/apache/maven/cli/MavenCli.java
Tue Jun 9 20:17:25 2009
@@ -90,6 +90,9 @@
private static Embedder embedder;
+ /**
+ * @deprecated Use {...@link Main#main(String[])} instead.
+ */
public static void main( String[] args )
{
ClassWorld classWorld = new ClassWorld( "plexus.core",
Thread.currentThread().getContextClassLoader() );
@@ -107,7 +110,7 @@
//
----------------------------------------------------------------------
// Setup the command line parser
//
----------------------------------------------------------------------
-
+
CLIManager cliManager = new CLIManager();
CommandLine commandLine;
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/AbstractConsoleDownloadMonitorTest.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/BatchModeDownloadMonitorTest.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/ConsoleDownloadMonitorTest.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Copied:
maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java
(from r783068,
maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java)
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java?p2=maven/components/branches/maven-2.2.0-RC/maven-cli/src/test/java/org/apache/maven/cli/MavenCliTest.java&p1=maven/components/branches/maven-2.2.0-RC/maven-core/src/test/java/org/apache/maven/cli/MavenCliTest.java&r1=783068&r2=783123&rev=783123&view=diff
==============================================================================
(empty)
Modified: maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/maven-core/pom.xml Tue Jun 9
20:17:25 2009
@@ -167,6 +167,41 @@
<filtering>true</filtering>
</resource>
</resources>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <executions>
+ <execution>
+ <id>default</id>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <excludes>
+ <exclude>**/cli/*.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <id>cli</id>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <includes>
+ <include>**/cli/*.java</include>
+ </includes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<reporting>
Modified:
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
---
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
(original)
+++
maven/components/branches/maven-2.2.0-RC/maven-core/src/main/java/org/apache/maven/plugin/MojoExecution.java
Tue Jun 9 20:17:25 2009
@@ -33,7 +33,9 @@
*/
public class MojoExecution
{
- private final String executionId;
+ // Execution ID needs to default to "default" to allow configuration of
that execution alongside
+ // other executions.
+ private String executionId = "default";
private final MojoDescriptor mojoDescriptor;
@@ -46,7 +48,6 @@
public MojoExecution( MojoDescriptor mojoDescriptor )
{
this.mojoDescriptor = mojoDescriptor;
- this.executionId = null;
this.configuration = null;
}
@@ -61,7 +62,6 @@
{
this.mojoDescriptor = mojoDescriptor;
this.configuration = configuration;
- this.executionId = null;
}
public String getExecutionId()
Modified: maven/components/branches/maven-2.2.0-RC/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.2.0-RC/pom.xml?rev=783123&r1=783122&r2=783123&view=diff
==============================================================================
--- maven/components/branches/maven-2.2.0-RC/pom.xml (original)
+++ maven/components/branches/maven-2.2.0-RC/pom.xml Tue Jun 9 20:17:25 2009
@@ -280,6 +280,7 @@
<module>maven-artifact</module>
<module>maven-artifact-manager</module>
<module>maven-artifact-test</module>
+ <module>maven-cli</module>
<module>maven-core</module>
<module>maven-error-diagnostics</module>
<module>maven-model</module>
@@ -371,6 +372,11 @@
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
+ <artifactId>maven-cli</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
<version>${mavenVersion}</version>
</dependency>
