aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvgeny Mandrikov <mandrikov@gmail.com>2015-03-14 17:53:38 +0100
committerEvgeny Mandrikov <mandrikov@gmail.com>2015-03-14 17:54:14 +0100
commitd4da8360f96f71357a379c6ebe5bd6d3d63e36ce (patch)
tree67ca5acf584e13a3be90b695f81fb59a9054ce5b
parent627762e66342c1768c1d02ad1e3dc436c22de065 (diff)
downloadplatform_external_jacoco-d4da8360f96f71357a379c6ebe5bd6d3d63e36ce.tar.gz
platform_external_jacoco-d4da8360f96f71357a379c6ebe5bd6d3d63e36ce.tar.bz2
platform_external_jacoco-d4da8360f96f71357a379c6ebe5bd6d3d63e36ce.zip
GitHub #235: fix execution of Maven Plugin integration tests with JDK 9
-rw-r--r--jacoco-maven-plugin.test/it/setup-parent/pom.xml4
-rw-r--r--org.jacoco.build/pom.xml3
2 files changed, 5 insertions, 2 deletions
diff --git a/jacoco-maven-plugin.test/it/setup-parent/pom.xml b/jacoco-maven-plugin.test/it/setup-parent/pom.xml
index 8286016d..3a3071c5 100644
--- a/jacoco-maven-plugin.test/it/setup-parent/pom.xml
+++ b/jacoco-maven-plugin.test/it/setup-parent/pom.xml
@@ -40,8 +40,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>@maven.compiler.source@</source>
+ <target>@maven.compiler.target@</target>
</configuration>
</plugin>
<plugin>
diff --git a/org.jacoco.build/pom.xml b/org.jacoco.build/pom.xml
index bfd116c7..07b19b12 100644
--- a/org.jacoco.build/pom.xml
+++ b/org.jacoco.build/pom.xml
@@ -130,6 +130,9 @@
<jacoco.home.url>http://www.eclemma.org/jacoco</jacoco.home.url>
<copyright.years>${project.inceptionYear}, 2015</copyright.years>
+ <maven.compiler.source>1.5</maven.compiler.source>
+ <maven.compiler.target>1.5</maven.compiler.target>
+
<jvm.args></jvm.args>
<argLine>${jvm.args}</argLine>