This is an automated email from the ASF dual-hosted git repository.
adangel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-compiler-plugin.git
The following commit(s) were added to refs/heads/master by this push:
new 31d868b Enable integration tests that use toolchains
31d868b is described below
commit 31d868bbd0316d34b10efb58b1e0a661ebf9e671
Author: Andreas Dangel <[email protected]>
AuthorDate: Sun Oct 4 12:57:07 2020 +0200
Enable integration tests that use toolchains
Note: java9 toolchain uses version 1.9
Available toolchains:
https://github.com/apache/infrastructure-p6/blob/production/modules/build_nodes/files/toolchains.xml
---
src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties | 2 +-
src/it/MCOMPILER-275_separate-moduleinfo/pom.xml | 2 +-
src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy | 7 ++++---
.../singleproject-toolchains/invoker.properties | 2 +-
src/it/multirelease-patterns/singleproject-toolchains/pom.xml | 2 +-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
index e596763..c6b2682 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-invoker.toolchain.jdk.version=9
+invoker.toolchain.jdk.version=1.9
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml
b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml
index 330663e..e6797a3 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/pom.xml
@@ -54,7 +54,7 @@
<!-- compile everything to ensure module-info contains right
entries -->
<configuration>
<jdkToolchain>
- <version>9</version>
+ <version>1.9</version>
</jdkToolchain>
<release>9</release>
</configuration>
diff --git a/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
b/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
index 60b858f..baf07f7 100644
--- a/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
+++ b/src/it/MCOMPILER-275_separate-moduleinfo/verify.groovy
@@ -18,10 +18,11 @@
*/
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] 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
+// major_version: 52 = java8 -> execution id "base-compile"
+assert new File( basedir, 'target/classes/com/foo/MyClass.class' ).bytes[7] ==
52
+// major_version: 53 = java9 -> execution id "default-compile"
assert new File( basedir, 'target/classes/module-info.class' ).bytes[7] == 53
diff --git
a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
index e0899b0..193b2ad 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
+++ b/src/it/multirelease-patterns/singleproject-toolchains/invoker.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
invoker.goals = verify -Pmulti-jar
-invoker.toolchain.jdk.version=9
+invoker.toolchain.jdk.version=1.9
diff --git a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
index 748e50b..efcadb4 100644
--- a/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
+++ b/src/it/multirelease-patterns/singleproject-toolchains/pom.xml
@@ -81,7 +81,7 @@
<configuration>
<release>9</release>
<jdkToolchain>
- <version>9</version>
+ <version>1.9</version>
</jdkToolchain>
<compileSourceRoots>
<compileSourceRoot>${project.basedir}/src/main/java9</compileSourceRoot>
