Support jdk15 (#4426) Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
diff --git a/.travis.yml b/.travis.yml index 7ab7480..66cdd26 100644 --- a/.travis.yml +++ b/.travis.yml
@@ -10,7 +10,7 @@ jdk: - oraclejdk8 - openjdk11 - - openjdk13 + - openjdk15 cache: directories:
diff --git a/etc/travis/travis.sh b/etc/travis/travis.sh index 21985dc..c71dbc3 100644 --- a/etc/travis/travis.sh +++ b/etc/travis/travis.sh
@@ -25,6 +25,8 @@ 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 80c648d..f037666 100644 --- a/examples/groovy/pom.xml +++ b/examples/groovy/pom.xml
@@ -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 7c3750b..a4e0c00 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 539b839..c3b915d 100644 --- a/test-framework/maven/container-runner-maven-plugin/pom.xml +++ b/test-framework/maven/container-runner-maven-plugin/pom.xml
@@ -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>