Skip to content

Commit 0d41ca7

Browse files
committed
Update libraries/gradle and run tests under openjdk 14.
1 parent 706f050 commit 0d41ca7

File tree

9 files changed

+37
-24
lines changed

9 files changed

+37
-24
lines changed

.travis.yml

+1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ jdk:
88
- openjdk11
99
- openjdk12
1010
- openjdk13
11+
- openjdk14
1112
before_script:
1213
- echo $JAVA_OPTS
1314
- export JAVA_OPTS=-Xmx1G

gradle/wrapper/gradle-wrapper.jar

215 Bytes
Binary file not shown.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

+2
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ esac
8282

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

85+
8586
# Determine the Java command to use to start the JVM.
8687
if [ -n "$JAVA_HOME" ] ; then
8788
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
129130
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
130131
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
131132
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
132134
JAVACMD=`cygpath --unix "$JAVACMD"`
133135

134136
# We build the pattern for arguments to be converted via cygpath

gradlew.bat

+1
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
8484

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

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

libraries.gradle

+28-21
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
ext {
22
jposVersion = '2.1.4-SNAPSHOT'
3-
slf4jVersion = '1.7.28'
3+
slf4jVersion = '1.7.30'
44
logbackVersion = '1.2.3'
5-
hibernateVersion = '5.4.6.Final'
5+
hibernateVersion = '5.4.15.Final'
66
geronimoVersion = '1.1.1'
7-
jettyVersion = '9.4.20.v20190813'
7+
jettyVersion = '9.4.28.v20200408'
88
servletApiVersion = '4.0.1'
99
websocketApiVersion = '1.1'
10-
jgroupsVersion = '4.1.5.Final'
10+
jgroupsVersion = '4.2.3.Final'
1111
jaxrsVersion = '2.0.1'
12-
jsonSchemaVersion = '2.2.11'
13-
guavaVersion = '28.1-jre'
14-
jacksonVersion = '2.10.0'
15-
groovyVersion = '2.5.8'
12+
jsonSchemaVersion = '2.2.13'
13+
guavaVersion = '29.0-jre'
14+
jacksonVersion = '2.11.0'
15+
groovyVersion = '3.0.3'
16+
jlineVersion = '2.14.6'
1617
restAssuredVersion = '2.9.0'
1718
vaadinVersion = '8.10.0'
18-
nettyVersion = '4.1.42.Final'
19+
nettyVersion = '4.1.49.Final'
1920
httpAsyncClientVersion = '4.1.4'
20-
mysqlJDBCVersion = '8.0.17'
21-
c3p0Version = '0.9.5.4'
22-
postgresJDBCVersion = '42.2.11'
23-
flywaydbVersion = '6.0.4'
24-
liquibaseVersion = '3.8.0'
21+
mysqlJDBCVersion = '8.0.20'
22+
c3p0Version = '0.9.5.5'
23+
postgresJDBCVersion = '42.2.12'
24+
flywaydbVersion = '6.4.1'
25+
liquibaseVersion = '3.8.9'
2526

2627
libraries = [
2728
//jUnit (Tests)
28-
junit: 'org.junit.jupiter:junit-jupiter:5.5.2',
29+
junit: 'org.junit.jupiter:junit-jupiter:5.6.2',
2930

3031
//jPOS
3132
jpos: "org.jpos:jpos:${jposVersion}",
3233

3334
//Apache Commons
34-
commons_lang: 'org.apache.commons:commons-lang3:3.9',
35+
commons_lang: 'org.apache.commons:commons-lang3:3.10',
3536
commons_logging: 'commons-logging:commons-logging:1.2',
3637

3738
//SLF4J and logback Stuff
@@ -43,7 +44,7 @@ ext {
4344
logback: "ch.qos.logback:logback-classic:${logbackVersion}",
4445

4546
//JODA-Time
46-
joda_time: 'joda-time:joda-time:2.10.4',
47+
joda_time: 'joda-time:joda-time:2.10.6',
4748

4849
//Hibernate
4950
hibernate_core: "org.hibernate:hibernate-core:${hibernateVersion}",
@@ -57,16 +58,19 @@ ext {
5758
jdbcH2: 'com.h2database:h2:1.4.199',
5859
jdbcMysql: "mysql:mysql-connector-java:${mysqlJDBCVersion}",
5960
jdbcPostgresql: "org.postgresql:postgresql:${postgresJDBCVersion}",
60-
jdbcMssql: 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8',
61+
jdbcMssql: 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8',
6162

6263
//Freemarker
63-
freemarker: 'org.freemarker:freemarker:[2.3.29,2.4)',
64+
freemarker: 'org.freemarker:freemarker:2.3.30',
6465

6566
//Mail
6667
javax_mail: 'javax.mail:javax.mail-api:1.6.2',
6768

69+
//Jakarta Activation
70+
jakarta_activation: 'jakarta.activation:jakarta.activation-api:1.2.2',
71+
6872
//SSHD
69-
sshd: 'org.apache.sshd:sshd-core:2.3.0',
73+
sshd: 'org.apache.sshd:sshd-core:2.4.0',
7074

7175
//Servlet API
7276
servlet_api: "javax.servlet:javax.servlet-api:${servletApiVersion}",
@@ -102,6 +106,9 @@ ext {
102106
groovysh: "org.codehaus.groovy:groovy-groovysh:${groovyVersion}",
103107
groovySql: "org.codehaus.groovy:groovy-sql:${groovyVersion}",
104108

109+
// Jline
110+
jline: "jline:jline:${jlineVersion}",
111+
105112
// Jackson
106113
jacksonDatabind: "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}",
107114

@@ -110,7 +117,7 @@ ext {
110117
nettyCodecHttp: "io.netty:netty-codec-http:${nettyVersion}",
111118

112119
// RestAssured
113-
restAssured: "io.rest-assured:rest-assured:4.1.1",
120+
restAssured: "io.rest-assured:rest-assured:4.3.0",
114121

115122
jsonSchemaValidator: "com.github.java-json-tools:json-schema-validator:${jsonSchemaVersion}",
116123
guava: "com.google.guava:guava:${guavaVersion}",

modules/groovy/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ dependencies {
44
api libraries.jpos
55
api libraries.groovy
66
api libraries.groovysh
7-
api group: 'org.fusesource.jansi', name: 'jansi', version: '1.11'
7+
implementation libraries.jline
8+
api group: 'org.fusesource.jansi', name: 'jansi', version: '1.18'
89

910
api libraries.groovySql
1011
}

modules/groovy/src/main/java/org/jpos/q2/cli/GROOVY.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121

2222
import groovy.lang.Binding;
23-
import org.codehaus.groovy.tools.shell.Groovysh;
23+
import org.apache.groovy.groovysh.Groovysh;
2424
import org.codehaus.groovy.tools.shell.IO;
2525
import org.jline.terminal.Attributes;
2626
import org.jline.terminal.Terminal;

modules/qrest/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ dependencies {
66
api libraries.nettyHandler
77
api libraries.nettyCodecHttp
88
api libraries.freemarker
9+
implementation libraries.jakarta_activation
910
api jsonSchemaValidatorLibs
1011
testImplementation libraries.junit
1112
testImplementation libraries.restAssured

0 commit comments

Comments
 (0)