Author: rfscholte
Date: Mon Oct 3 20:04:11 2016
New Revision: 1763205
URL: http://svn.apache.org/viewvc?rev=1763205&view=rev
Log:
[MCOMPILER-269] Support modulepath (Java9/Jigsaw)
remove --add-modules, already implicitly added by --add-reads
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
Added:
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy?rev=1763205&view=auto
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
(added)
+++
maven/plugins/trunk/maven-compiler-plugin/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
Mon Oct 3 20:04:11 2016
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+def log = new File( basedir, 'build.log').text
+
+//requires adding custom toolchains...
+//assert log.count( "[INFO] Toolchain in maven-compiler-plugin: JDK" ) == 1
+
+assert log.count( "[INFO] Changes detected - recompiling the module!" ) == 3
+
+assert new File( basedir, 'target/classes/com/foo/MyClass.class' ).bytes[7] ==
50
+assert new File( basedir, 'target/classes/module-info.class' ).bytes[7] == 53
Modified:
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java?rev=1763205&r1=1763204&r2=1763205&view=diff
==============================================================================
---
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
(original)
+++
maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/compiler/TestCompilerMojo.java
Mon Oct 3 20:04:11 2016
@@ -258,8 +258,6 @@ public class TestCompilerMojo
{
String moduleName = new
AsmModuleInfoParser().getModuleName( mainOutputDirectory );
compilerArgs.add( "-Xmodule:" + moduleName );
- compilerArgs.add( "--add-modules" );
- compilerArgs.add( moduleName );
compilerArgs.add( "--add-reads" );
compilerArgs.add( moduleName + "=ALL-UNNAMED" );
}
