Skip to content

Commit 7421515

Browse files
authored
Support jdk15 (#4426)
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
1 parent 3d04682 commit 7421515

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ services:
1010
jdk:
1111
- oraclejdk8
1212
- openjdk11
13-
- openjdk13
13+
- openjdk15
1414

1515
cache:
1616
directories:

etc/travis/travis.sh

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ trap 'error_handler' ERR
2525
bash -c "while true; do tail -5 $BUILD_OUTPUT; sleep $PING_SLEEP; done" &
2626
PING_LOOP_PID=$!
2727

28+
mvn -version
29+
2830
if [ "$1" = "glassfish-copyright:copyright" ]; then
2931
mvn glassfish-copyright:copyright
3032
else

examples/groovy/pom.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2010, 2019 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2010, 2020 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Distribution License v. 1.0, which is available at
@@ -28,7 +28,8 @@
2828
<dependency>
2929
<groupId>org.codehaus.groovy</groupId>
3030
<artifactId>groovy-all</artifactId>
31-
<version>2.4.3</version>
31+
<type>pom</type>
32+
<version>3.0.2</version>
3233
</dependency>
3334
<dependency>
3435
<groupId>org.glassfish.jersey.test-framework.providers</groupId>

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@
465465
<exclude>bundles/**</exclude>
466466
<fileExclude>module-info.java</fileExclude>
467467
</sourceFileExcludes>
468-
<verbose />
468+
<verbose>true</verbose>
469469
<additionalparam>-Xdoclint:none</additionalparam>
470470
<maxmemory>256m</maxmemory>
471471
</configuration>

test-framework/maven/container-runner-maven-plugin/pom.xml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
4-
Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved.
4+
Copyright (c) 2015, 2020 Oracle and/or its affiliates. All rights reserved.
55
66
This program and the accompanying materials are made available under the
77
terms of the Eclipse Public License v. 2.0, which is available at
@@ -36,9 +36,9 @@
3636
</description>
3737

3838
<properties>
39-
<groovy.version>2.4.9</groovy.version>
40-
<groovy-eclipse-compiler.version>2.9.2-01</groovy-eclipse-compiler.version>
41-
<groovy-eclipse-batch.version>2.5.7-01</groovy-eclipse-batch.version>
39+
<groovy.version>3.0.2</groovy.version>
40+
<groovy-eclipse-compiler.version>3.6.0-03</groovy-eclipse-compiler.version>
41+
<groovy-eclipse-batch.version>3.0.2-02</groovy-eclipse-batch.version>
4242
<maven.version>3.6.0</maven.version>
4343
<maven-plugin.version>3.6.0</maven-plugin.version>
4444
</properties>
@@ -109,6 +109,7 @@
109109
<dependency>
110110
<groupId>org.codehaus.groovy</groupId>
111111
<artifactId>groovy-all</artifactId>
112+
<type>pom</type>
112113
<version>${groovy.version}</version>
113114
</dependency>
114115

0 commit comments

Comments
 (0)