You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by tr...@apache.org on 2005/08/24 12:27:33 UTC

svn commit: r239596 - /maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Author: trygvis
Date: Wed Aug 24 03:27:28 2005
New Revision: 239596

URL: http://svn.apache.org/viewcvs?rev=239596&view=rev
Log:
o Adding a missing part of Rod's last patch.

Modified:
    maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Modified: maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=239596&r1=239595&r2=239596&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Wed Aug 24 03:27:28 2005
@@ -111,6 +111,13 @@
     private String compilerId;
 
     /**
+     * Version of the compiler to use, ex. "1.3", "1.5"
+     *
+     * @parameter
+     */
+    private String compilerVersion;
+
+    /**
      * Runs the compiler in a separate process.
      * <p/>
      * If not set the compiler will default to a executable.
@@ -248,6 +255,8 @@
 
         compilerConfiguration.setWorkingDirectory( basedir );
 
+        compilerConfiguration.setCompilerVersion( compilerVersion );
+
         compilerConfiguration.setBuildDirectory( buildDirectory );
 
         compilerConfiguration.setOutputFileName( outputFileName );
@@ -265,7 +274,7 @@
             canUpdateTarget = compiler.canUpdateTarget( compilerConfiguration );
 
             if ( compiler.getCompilerOutputStyle() == CompilerOutputStyle.ONE_OUTPUT_FILE_FOR_ALL_INPUT_FILES &&
-                !canUpdateTarget )
+                 !canUpdateTarget )
             {
                 getLog().info( "RESCANNING!" );
                 // TODO: This second scan for source files is sub-optimal



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org