[maven-surefire] branch master updated: integration tests with Java 9+ should use <maven.compiler.release>${java.specification.version}</maven.compiler.release>

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-surefire] branch master updated: integration tests with Java 9+ should use <maven.compiler.release>${java.specification.version}</maven.compiler.release>

Tibor Digana
This is an automated email from the ASF dual-hosted git repository.

tibordigana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-surefire.git


The following commit(s) were added to refs/heads/master by this push:
     new 3a6b00a  integration tests with Java 9+ should use <maven.compiler.release>${java.specification.version}</maven.compiler.release>
3a6b00a is described below

commit 3a6b00abfe46e87521dd207e5ed56431c01dd035
Author: tibordigana <[hidden email]>
AuthorDate: Sun Nov 10 13:07:33 2019 +0100

    integration tests with Java 9+ should use <maven.compiler.release>${java.specification.version}</maven.compiler.release>
---
 surefire-its/src/test/resources/java9-full-api/pom.xml      | 10 ++++++++++
 surefire-its/src/test/resources/modulepath/pom.xml          |  5 +++--
 surefire-its/src/test/resources/surefire-1265/pom.xml       | 13 +++++++++++--
 .../surefire-1534-reuse-forks-false-java-module/pom.xml     |  9 +++++++--
 .../surefire-1712-extracted-modulename-without-asm/pom.xml  |  3 +--
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/surefire-its/src/test/resources/java9-full-api/pom.xml b/surefire-its/src/test/resources/java9-full-api/pom.xml
index 2e4d4f3..ca27e2b 100644
--- a/surefire-its/src/test/resources/java9-full-api/pom.xml
+++ b/surefire-its/src/test/resources/java9-full-api/pom.xml
@@ -32,9 +32,19 @@
 
     <artifactId>java9-full-api</artifactId>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>${java.specification.version}</maven.compiler.release>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <forkMode>once</forkMode>
diff --git a/surefire-its/src/test/resources/modulepath/pom.xml b/surefire-its/src/test/resources/modulepath/pom.xml
index e4a7783..f5cc763 100644
--- a/surefire-its/src/test/resources/modulepath/pom.xml
+++ b/surefire-its/src/test/resources/modulepath/pom.xml
@@ -10,7 +10,8 @@
     <name>app</name>
 
     <properties>
-        <maven.compiler.release>9</maven.compiler.release>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>${java.specification.version}</maven.compiler.release>
     </properties>
 
     <build>
@@ -18,7 +19,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.2</version>
+                <version>3.8.1</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/surefire-its/src/test/resources/surefire-1265/pom.xml b/surefire-its/src/test/resources/surefire-1265/pom.xml
index ec74a49..078e2f8 100644
--- a/surefire-its/src/test/resources/surefire-1265/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1265/pom.xml
@@ -34,8 +34,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>9</maven.compiler.source>
-        <maven.compiler.target>9</maven.compiler.target>
+        <maven.compiler.release>${java.specification.version}</maven.compiler.release>
     </properties>
 
     <dependencies>
@@ -46,4 +45,14 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml b/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
index 491cecf..0f5d354 100644
--- a/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1534-reuse-forks-false-java-module/pom.xml
@@ -29,8 +29,8 @@
     <version>1.0</version>
 
     <properties>
-        <maven.compiler.source>9</maven.compiler.source>
-        <maven.compiler.target>9</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.release>${java.specification.version}</maven.compiler.release>
         <junit.version>5.3.2</junit.version>
     </properties>
 
@@ -60,6 +60,11 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${surefire.version}</version>
             </plugin>
diff --git a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
index f2cb6aa..d75fe8e 100644
--- a/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
+++ b/surefire-its/src/test/resources/surefire-1712-extracted-modulename-without-asm/pom.xml
@@ -28,9 +28,8 @@
     <version>1.0</version>
 
     <properties>
-        <junit-platform.version>5.5.2</junit-platform.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>9</maven.compiler.release>
+        <maven.compiler.release>${java.specification.version}</maven.compiler.release>
     </properties>
 
     <dependencies>