[maven-surefire] branch SUREFIRE-1570 updated: fixed impl and Java9FullApiIT

[tibordigana]

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

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


The following commit(s) were added to refs/heads/SUREFIRE-1570 by this push:
     new 0fbe05e  fixed impl and Java9FullApiIT
0fbe05e is described below

commit 0fbe05e2f8064b64500ebd2d07b221e956c1a2cb
Author: tibordigana <tibordig...@apache.org>
AuthorDate: Thu May 14 00:25:46 2020 +0200

    fixed impl and Java9FullApiIT
---
 .../org/apache/maven/plugin/surefire/AbstractSurefireMojo.java   | 9 +++++++++
 .../java9-full-api/src/test/java/{ => java9/full/api}/J9IT.java  | 2 ++
 .../src/test/java/{ => java9/full/api}/J9Test.java               | 2 ++
 3 files changed, 13 insertions(+)

diff --git 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 232f8b0..d83ed20 100644
--- 
a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ 
b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1388,6 +1388,15 @@ public abstract class AbstractSurefireMojo
     {
         File mainBuildPath = getMainBuildPath();
 
+        if ( mainBuildPath.isDirectory() )
+        {
+            mainBuildPath = new File( mainBuildPath, "module-info.class" );
+            if ( !mainBuildPath.exists() )
+            {
+                return null;
+            }
+        }
+
         try
         {
             // .setJdkHome(  )
diff --git 
a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java 
b/surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9IT.java
similarity index 98%
rename from 
surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
rename to 
surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9IT.java
index c74678d..9c8f976 100644
--- a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9IT.java
+++ 
b/surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9IT.java
@@ -1,3 +1,5 @@
+package java9.full.api;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git 
a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java 
b/surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9Test.java
similarity index 98%
rename from 
surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
rename to 
surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9Test.java
index 6fc8536..71e645f 100644
--- a/surefire-its/src/test/resources/java9-full-api/src/test/java/J9Test.java
+++ 
b/surefire-its/src/test/resources/java9-full-api/src/test/java/java9/full/api/J9Test.java
@@ -1,3 +1,5 @@
+package java9.full.api;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file