diff --git a/libraries.gradle b/libraries.gradle index 048d05ebb5..910e8ce185 100644 --- a/libraries.gradle +++ b/libraries.gradle @@ -1,38 +1,38 @@ ext { jposVersion = '2.1.5-SNAPSHOT' - slf4jVersion = '1.7.28' + slf4jVersion = '1.7.30' logbackVersion = '1.2.3' - hibernateVersion = '5.4.6.Final' + hibernateVersion = '5.4.15.Final' geronimoVersion = '1.1.1' - jettyVersion = '9.4.20.v20190813' + jettyVersion = '9.4.28.v20200408' servletApiVersion = '4.0.1' websocketApiVersion = '1.1' - jgroupsVersion = '4.1.5.Final' + jgroupsVersion = '4.2.3.Final' jaxrsVersion = '2.0.1' - jsonSchemaVersion = '2.2.11' - guavaVersion = '28.1-jre' - jacksonVersion = '2.10.0' + jsonSchemaVersion = '2.2.13' + guavaVersion = '29.0-jre' + jacksonVersion = '2.11.0' groovyVersion = '3.0.4' jlineVersion = '2.14.6' restAssuredVersion = '2.9.0' vaadinVersion = '8.10.0' - nettyVersion = '4.1.42.Final' + nettyVersion = '4.1.49.Final' httpAsyncClientVersion = '4.1.4' - mysqlJDBCVersion = '8.0.17' - c3p0Version = '0.9.5.4' - postgresJDBCVersion = '42.2.11' - flywaydbVersion = '6.0.4' - liquibaseVersion = '3.8.0' + mysqlJDBCVersion = '8.0.20' + c3p0Version = '0.9.5.5' + postgresJDBCVersion = '42.2.12' + flywaydbVersion = '6.4.1' + liquibaseVersion = '3.8.9' libraries = [ //jUnit (Tests) - junit: 'org.junit.jupiter:junit-jupiter:5.5.2', + junit: 'org.junit.jupiter:junit-jupiter:5.6.2', //jPOS jpos: "org.jpos:jpos:${jposVersion}", //Apache Commons - commons_lang: 'org.apache.commons:commons-lang3:3.9', + commons_lang: 'org.apache.commons:commons-lang3:3.10', commons_logging: 'commons-logging:commons-logging:1.2', //SLF4J and logback Stuff @@ -44,7 +44,7 @@ ext { logback: "ch.qos.logback:logback-classic:${logbackVersion}", //JODA-Time - joda_time: 'joda-time:joda-time:2.10.4', + joda_time: 'joda-time:joda-time:2.10.6', //Hibernate hibernate_core: "org.hibernate:hibernate-core:${hibernateVersion}", @@ -58,16 +58,19 @@ ext { jdbcH2: 'com.h2database:h2:1.4.199', jdbcMysql: "mysql:mysql-connector-java:${mysqlJDBCVersion}", jdbcPostgresql: "org.postgresql:postgresql:${postgresJDBCVersion}", - jdbcMssql: 'com.microsoft.sqlserver:mssql-jdbc:7.4.1.jre8', + jdbcMssql: 'com.microsoft.sqlserver:mssql-jdbc:8.2.2.jre8', //Freemarker - freemarker: 'org.freemarker:freemarker:[2.3.29,2.4)', + freemarker: 'org.freemarker:freemarker:2.3.30', //Mail javax_mail: 'javax.mail:javax.mail-api:1.6.2', + //Jakarta Activation + jakarta_activation: 'jakarta.activation:jakarta.activation-api:1.2.2', + //SSHD - sshd: 'org.apache.sshd:sshd-core:2.3.0', + sshd: 'org.apache.sshd:sshd-core:2.4.0', //Servlet API servlet_api: "javax.servlet:javax.servlet-api:${servletApiVersion}", diff --git a/modules/groovy/build.gradle b/modules/groovy/build.gradle index 8a60ff9c34..ea9649a507 100644 --- a/modules/groovy/build.gradle +++ b/modules/groovy/build.gradle @@ -5,7 +5,7 @@ dependencies { api libraries.groovy api libraries.groovysh implementation libraries.jline - api group: 'org.fusesource.jansi', name: 'jansi', version: '1.11' + api group: 'org.fusesource.jansi', name: 'jansi', version: '1.18' api libraries.groovySql } diff --git a/modules/groovy/src/main/java/org/jpos/q2/cli/GROOVY.java b/modules/groovy/src/main/java/org/jpos/q2/cli/GROOVY.java index a42f147f37..142ed98999 100644 --- a/modules/groovy/src/main/java/org/jpos/q2/cli/GROOVY.java +++ b/modules/groovy/src/main/java/org/jpos/q2/cli/GROOVY.java @@ -20,7 +20,7 @@ import groovy.lang.Binding; -import org.codehaus.groovy.tools.shell.Groovysh; +import org.apache.groovy.groovysh.Groovysh; import org.codehaus.groovy.tools.shell.IO; import org.jline.terminal.Attributes; import org.jline.terminal.Terminal; diff --git a/modules/qrest/build.gradle b/modules/qrest/build.gradle index 8a6a6106f1..3857792870 100644 --- a/modules/qrest/build.gradle +++ b/modules/qrest/build.gradle @@ -6,6 +6,7 @@ dependencies { api libraries.nettyHandler api libraries.nettyCodecHttp api libraries.freemarker + implementation libraries.jakarta_activation api jsonSchemaValidatorLibs testImplementation libraries.junit testImplementation libraries.restAssured