svn commit: r642823 - in /maven/plugins/trunk/maven-invoker-plugin: pom.xml src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java

[olamy]

Author: olamy
Date: Sun Mar 30 14:57:18 2008
New Revision: 642823

URL: http://svn.apache.org/viewvc?rev=642823&view=rev
Log:
[MINVOKER-27] Allow to set MAVEN_OPTS when invoking Maven


Modified:
    maven/plugins/trunk/maven-invoker-plugin/pom.xml
    
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java

Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=642823&r1=642822&r2=642823&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Mar 30 14:57:18 2008
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>2.0.7</version>
+      <version>2.0.8-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>

Modified: 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java?rev=642823&r1=642822&r2=642823&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
 (original)
+++ 
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerMojo.java
 Sun Mar 30 14:57:18 2008
@@ -268,6 +268,15 @@
      * @since 1.2
      */
     private File settingsFile;
+    
+
+    /**
+     * The MAVEN_OPTS env var to use when invoking maven
+     * 
+     * @parameter expression="${invoker.mavenOpts}"
+     * @since 1.2
+     */    
+    private String mavenOpts;
 
     public void execute()
         throws MojoExecutionException, MojoFailureException
@@ -581,6 +590,11 @@
             if ( settingsFile != null )
             {
                 request.setUserSettingsFile( settingsFile );
+            }
+            
+            if ( mavenOpts != null )
+            {
+                request.setMavenOpts( mavenOpts );
             }
 
             try