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

rfscholte pushed a commit to branch MJAVADOC-449
in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git


The following commit(s) were added to refs/heads/MJAVADOC-449 by this push:
     new 69fa5c0  Fix verify script for Java 10
69fa5c0 is described below

commit 69fa5c017f5f80bd3e51615aac6ea3f0c027cb2b
Author: rfscholte <rfscho...@apache.org>
AuthorDate: Sat Nov 24 19:17:17 2018 +0100

    Fix verify script for Java 10
---
 .../MJAVADOC-449_aggr_modulepath/verify.groovy     | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy 
b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy
index 9f22fea..28fdb1f 100644
--- a/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy
+++ b/src/it/projects/MJAVADOC-449_aggr_modulepath/verify.groovy
@@ -17,10 +17,22 @@
  * under the License.
  */
  
-def index = new File( basedir, 'target/site/apidocs/index.html')
+int javaVersion = System.getProperty( "java.specification.version" ) as Integer
+if ( javaVersion >= 11 ) {
+    def index = new File( basedir, 'target/site/apidocs/index.html')
 
-assert index.text =~ /<a href="modulea\/module-summary\.html">modulea<\/a>/
-assert index.text =~ /<a href="moduleb\/module-summary\.html">moduleb<\/a>/
+       assert index.text =~ /<a 
href="modulea\/module-summary\.html">modulea<\/a>/
+       assert index.text =~ /<a 
href="moduleb\/module-summary\.html">moduleb<\/a>/
+       
+       assert new File( basedir, 
'target/site/apidocs/modulea/module-summary.html').exists()
+       assert new File( basedir, 
'target/site/apidocs/moduleb/module-summary.html').exists()
+} 
+else {
+    def overview = new File( basedir, 
'target/site/apidocs/overview-summary.html')
 
-assert new File( basedir, 
'target/site/apidocs/modulea/module-summary.html').exists()
-assert new File( basedir, 
'target/site/apidocs/moduleb/module-summary.html').exists()
\ No newline at end of file
+       assert overview.text =~ /<a href="modulea-summary.html">modulea<\/a>/
+       assert overview.text =~ /<a href="moduleb-summary.html">moduleb<\/a>/
+       
+       assert new File( basedir, 
'target/site/apidocs/modulea-summary.html').exists()
+       assert new File( basedir, 
'target/site/apidocs/moduleb-summary.html').exists()
+} 

Reply via email to