From 7421515fbe3924691f057c859da32342d3f8d18c Mon Sep 17 00:00:00 2001
From: jbescos <jorge.bescos.gascon@oracle.com>
Date: Fri, 17 Apr 2020 13:24:02 +0200
Subject: [PATCH] Support jdk15 (#4426)

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 .travis.yml                                              | 2 +-
 etc/travis/travis.sh                                     | 2 ++
 examples/groovy/pom.xml                                  | 5 +++--
 pom.xml                                                  | 2 +-
 .../maven/container-runner-maven-plugin/pom.xml          | 9 +++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7ab7480761..66cdd2666e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ services:
 jdk:
   - oraclejdk8
   - openjdk11
-  - openjdk13
+  - openjdk15
 
 cache:
   directories:
diff --git a/etc/travis/travis.sh b/etc/travis/travis.sh
index 4c6030ca39..44a88395f0 100644
--- a/etc/travis/travis.sh
+++ b/etc/travis/travis.sh
@@ -25,6 +25,8 @@ trap 'error_handler' ERR
 bash -c "while true; do tail -5 $BUILD_OUTPUT; sleep $PING_SLEEP; done" &
 PING_LOOP_PID=$!
 
+mvn -version
+
 if [ "$1" = "glassfish-copyright:copyright" ]; then
     mvn glassfish-copyright:copyright
 else
diff --git a/examples/groovy/pom.xml b/examples/groovy/pom.xml
index 7fe1708993..b72f7489df 100644
--- a/examples/groovy/pom.xml
+++ b/examples/groovy/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -28,7 +28,8 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
-            <version>2.4.3</version>
+            <type>pom</type>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git a/pom.xml b/pom.xml
index 98e7bd4942..03f25ac0b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -465,7 +465,7 @@
                             <exclude>bundles/**</exclude>
                             <fileExclude>module-info.java</fileExclude>
                         </sourceFileExcludes>
-                        <verbose />
+                        <verbose>true</verbose>
                         <additionalparam>-Xdoclint:none</additionalparam>
                         <maxmemory>256m</maxmemory>
                     </configuration>
diff --git a/test-framework/maven/container-runner-maven-plugin/pom.xml b/test-framework/maven/container-runner-maven-plugin/pom.xml
index 628f18d691..dfce26c935 100644
--- a/test-framework/maven/container-runner-maven-plugin/pom.xml
+++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 
-    Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -36,9 +36,9 @@
     </description>
 
     <properties>
-        <groovy.version>2.4.9</groovy.version>
-        <groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
-        <groovy-eclipse-batch.version>2.5.7-01</groovy-eclipse-batch.version>
+        <groovy.version>3.0.2</groovy.version>
+        <groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version>
+        <groovy-eclipse-batch.version>3.0.2-02</groovy-eclipse-batch.version>
         <maven.version>3.6.0</maven.version>
         <maven-plugin.version>3.6.0</maven-plugin.version>
     </properties>
@@ -109,6 +109,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
             <version>${groovy.version}</version>
         </dependency>