svn commit: r1656367 - in /maven/plugins/trunk/maven-compiler-plugin/src: it/mcompiler-120/pom.xml site/apt/examples/pass-compiler-arguments.apt.vm

[bi...@apache.org]

Author: bimargulies
Date: Sun Feb  1 22:12:18 2015
New Revision: 1656367

URL: http://svn.apache.org/r1656367
Log:
MCOMPILER-120: switch doc for compiler options to current working syntax, clean up confusion in it.

Modified:
    maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
    maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm

Modified: maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml?rev=1656367&r1=1656366&r2=1656367&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-120/pom.xml Sun Feb  1 22:12:18 2015
@@ -52,14 +52,11 @@ under the License.
           <verbose>true</verbose>
           <debug>true</debug>
           <optimize>true</optimize>
-          <!-- commented out until fixed
-               <showDeprecation>true</showDeprecation>
-               <showWarnings>true</showWarnings>
-          -->
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
           <compilerArgs>
             <arg>-Werror</arg>
-            <arg>-Xlint:all</arg>
-            <arg>-Xlint:-path</arg>
+            <arg>-Xlint:all,-options,-path</arg>
           </compilerArgs>
           <fork>true</fork>
         </configuration>

Modified: maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm?rev=1656367&r1=1656366&r2=1656367&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/site/apt/examples/pass-compiler-arguments.apt.vm Sun Feb  1 22:12:18 2015
@@ -30,8 +30,8 @@ Pass Compiler Arguments
 
   Sometimes, you need to pass other compiler arguments that are not handled by
   the Compiler Plugin itself but is supported by the <<<compilerId>>> selected.
-  For such arguments, the Compiler Plugin's <<<compilerArguments>>> will be
-  used.  The following example passes compiler arguments to the <<<javac>>>
+  For such arguments, use the Compiler Plugin's <<<compilerArgs>>> parameter
+  The following example passes compiler arguments to the <<<javac>>>
   compiler:
 
 +-----
@@ -44,35 +44,10 @@ Pass Compiler Arguments
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${project.version}</version>
-        <configuration>
-          <compilerArgument>-verbose -bootclasspath ${java.home}\lib\rt.jar</compilerArgument>
-        </configuration>
-      </plugin>
-    </plugins>
-    [...]
-  </build>
-  [...]
-</project>
-+-----
-
-  Or you can also use the Map version:
-
-+-----
-<project>
-  [...]
-  <build>
-    [...]
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${project.version}</version>
-        <configuration>
-          <compilerArguments>
-            <verbose />
-            <bootclasspath>${java.home}\lib\rt.jar</bootclasspath>
-          </compilerArguments>
-        </configuration>
+        <compilerArgs>
+            <arg>-verbose</arg>
+            <arg>-Xlint:all,-options,-path</arg>
+          </compilerArgs>
       </plugin>
     </plugins>
     [...]