Skip to content

Commit

Permalink
Support jdk15 (#4426)
Browse files Browse the repository at this point in the history
Signed-off-by: Jorge Bescos Gascon <[email protected]>
  • Loading branch information
jbescos committed Apr 17, 2020
1 parent 3d04682 commit 7421515
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
jdk:
- oraclejdk8
- openjdk11
- openjdk13
- openjdk15

cache:
directories:
Expand Down
2 changes: 2 additions & 0 deletions etc/travis/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/groovy/pom.xml
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 5 additions & 4 deletions test-framework/maven/container-runner-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -109,6 +109,7 @@
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<type>pom</type>
<version>${groovy.version}</version>
</dependency>

Expand Down

0 comments on commit 7421515

Please sign in to comment.