Author: rfscholte
Date: Sun Dec 21 11:03:05 2014
New Revision: 1647119
URL: http://svn.apache.org/r1647119
Log:
Why was I right with my previous comment? Don't trust vendor specific message!
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-179/verify.groovy
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-179/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-179/verify.groovy?rev=1647119&r1=1647118&r2=1647119&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-179/verify.groovy
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/mcompiler-179/verify.groovy
Sun Dec 21 11:03:05 2014
@@ -21,15 +21,7 @@ def logFile = new File( basedir, 'build.
assert logFile.exists()
content = logFile.text
-// JDK (,1.9): 1 warning:
-// [WARNING] bootstrap class path not set in conjunction with -source 1.6
-// [INFO] 1 warning
-//
-// JDK [1.9,):
-// [WARNING] bootstrap class path not set in conjunction with -source 1.6
-// [WARNING] source value 1.6 is obsolete and will be removed in a future
release
-// [WARNING] target value 1.6 is obsolete and will be removed in a future
release
-// [WARNING] To suppress warnings about obsolete options, use -Xlint:-options.
-// [INFO] 4 warnings
-assert content.contains( '[WARNING] bootstrap class path not set in
conjunction with -source 1.6' )
+// messages differ per vendor
+assert content.contains( '[WARNING] COMPILATION WARNING :' )
+assert content =~ /\d+ warnings?/
assert content.contains( '1 error' )
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java?rev=1647119&r1=1647118&r2=1647119&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/AbstractCompilerMojo.java
Sun Dec 21 11:03:05 2014
@@ -366,7 +366,7 @@ public abstract class AbstractCompilerMo
/**
* @since 3.0 needed for storing the status for the incremental build
support.
*/
- @Parameter( property = "mojoExecution", readonly = true, required = true )
+ @Parameter( defaultValue = "${mojoExecution}", readonly = true, required =
true )
private MojoExecution mojoExecution;
/**
