Author: jdcasey
Date: Thu Oct 2 21:18:55 2014
New Revision: 1629071
URL: http://svn.apache.org/r1629071
Log:
[MCOMPILER-224] Fixing integration test and re-enabling it.
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/invoker.properties
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/verify.groovy
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/invoker.properties
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/invoker.properties?rev=1629071&r1=1629070&r2=1629071&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/invoker.properties
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/invoker.properties
Thu Oct 2 21:18:55 2014
@@ -15,6 +15,6 @@
# specific language governing permissions and limitations
# under the License.
-#invoker.java.version = 1.6+
+invoker.java.version = 1.6+
# message with JDK6 is prepended by unexpected prefix, so quick workaround is
to ignore JDK6...
-invoker.java.version = 1.7+
+#invoker.java.version = 1.7+
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/verify.groovy?rev=1629071&r1=1629070&r2=1629071&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/verify.groovy
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-224/verify.groovy
Thu Oct 2 21:18:55 2014
@@ -18,10 +18,10 @@
*/
def log = new File( basedir, 'build.log').text
-def noteExists = log.contains( "[INFO] NOTE Test message." )
-def otherExists = log.contains( "[INFO] OTHER Test message." )
-def warningExists = log.contains( "[WARNING] WARNING Test message." )
-def mandatoryWarningExists = log.contains( "[WARNING] MANDATORY_WARNING Test
message." )
+def noteExists = log =~ /\[INFO\] (\w+: )?NOTE Test message\./
+def otherExists = log =~ /\[INFO\] (\w+: )?OTHER Test message\./
+def warningExists = log =~ /\[WARNING\] (\w+: )?WARNING Test message\./
+def mandatoryWarningExists = log =~ /\[WARNING\] (\w+: )?MANDATORY_WARNING
Test message\./
def fail = false
def messages = "The following assertions were violated:"
