Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update gradle to version 6.5 and fix jdk14 compatibility #162

Merged
merged 1 commit into from
Jun 26, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ jdk:
- openjdk11
- openjdk12
- openjdk13
- openjdk14
before_script:
- echo $JAVA_OPTS
- export JAVA_OPTS=-Xmx1G
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 2 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar


# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
Expand Down Expand Up @@ -129,6 +130,7 @@ fi
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`

JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

Expand Down
8 changes: 6 additions & 2 deletions libraries.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ ext {
jsonSchemaVersion = '2.2.11'
guavaVersion = '28.1-jre'
jacksonVersion = '2.10.0'
groovyVersion = '2.5.8'
groovyVersion = '3.0.4'
jlineVersion = '2.14.6'
restAssuredVersion = '2.9.0'
vaadinVersion = '8.10.0'
nettyVersion = '4.1.42.Final'
Expand Down Expand Up @@ -102,6 +103,9 @@ ext {
groovysh: "org.codehaus.groovy:groovy-groovysh:${groovyVersion}",
groovySql: "org.codehaus.groovy:groovy-sql:${groovyVersion}",

// Jline
jline: "jline:jline:${jlineVersion}",

// Jackson
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",

Expand All @@ -110,7 +114,7 @@ ext {
nettyCodecHttp: "io.netty:netty-codec-http:${nettyVersion}",

// RestAssured
restAssured: "io.rest-assured:rest-assured:4.1.1",
restAssured: "io.rest-assured:rest-assured:4.3.0",

jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
guava: "com.google.guava:guava:${guavaVersion}",
Expand Down
4 changes: 2 additions & 2 deletions modules/binlog/src/test/java/org/jpos/binlog/BinLogTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public void run() {

@AfterAll
public static void cleanup() throws IOException {
if (Files.list(dir) != null) {
if (Files.isDirectory(dir)) {
for (Path f : Files.newDirectoryStream(dir)) {
if (f.toString().endsWith(".dat")) {
System.out.println ("Deleting " + f.toString());
Expand All @@ -109,6 +109,6 @@ public static void cleanup() throws IOException {
}
}
System.out.println ("Deleting " + dir);
Files.delete(dir);
Files.deleteIfExists(dir);
}
}
1 change: 1 addition & 0 deletions modules/groovy/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ dependencies {
api libraries.jpos
api libraries.groovy
api libraries.groovysh
implementation libraries.jline
api group: 'org.fusesource.jansi', name: 'jansi', version: '1.11'

api libraries.groovySql
Expand Down