From 76103bd0c62cb1a4dfabf1a3d81a312da9f42a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Sat, 16 Dec 2023 22:31:59 +0100 Subject: [PATCH] update to netty 4.1.104, add snakeyaml to override legacy version --- elx-api/build.gradle | 1 + gradle.properties | 4 +++- settings.gradle | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/elx-api/build.gradle b/elx-api/build.gradle index d621ae9..a29aac2 100644 --- a/elx-api/build.gradle +++ b/elx-api/build.gradle @@ -11,6 +11,7 @@ dependencies { implementation libs.jackson.cbor implementation libs.jackson.smile implementation libs.jackson.yaml + implementation libs.snakeyaml implementation libs.lucene implementation libs.lucene.analyzers.common implementation libs.lucene.highlighter diff --git a/gradle.properties b/gradle.properties index 76a947e..274e8c7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,7 @@ group = org.xbib name = elx -version = 7.10.2.36 +version = 7.10.2.37 org.gradle.warning.mode = ALL + +org.gradle.daemon = false diff --git a/settings.gradle b/settings.gradle index a88d19f..b7f150d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,10 +8,10 @@ dependencyResolutionManagement { // ES 7.10.2 uses log4j2 2.11.1 version('log4j', '2.22.0') // ES 7.10.2 uses netty 4.1.49 - version('netty', '4.1.101.Final') + version('netty', '4.1.104.Final') // ES 7.10.2 uses Jackson 2.10.4 - version('jackson', '2.15.2') - version('net-http', '4.0.6') // must match netty version + version('jackson', '2.16.0') + version('net-http', '4.0.7') // must match netty version library('log4j-api', 'org.apache.logging.log4j', 'log4j-api').versionRef('log4j') library('log4j-core', 'org.apache.logging.log4j', 'log4j-core').versionRef('log4j') library('log4j-slf4j', 'org.apache.logging.log4j', 'log4j-slf4j-impl').versionRef('log4j') @@ -37,16 +37,17 @@ dependencyResolutionManagement { library('netty-buffer', 'io.netty', 'netty-buffer').versionRef('netty') library('netty-transport', 'io.netty', 'netty-transport').versionRef('netty') library('net-http-netty-client', 'org.xbib', 'net-http-client-netty').versionRef('net-http') + library('jna', 'net.java.dev.jna', 'jna').version('5.14.0') + library('snakeyaml', 'org.yaml', 'snakeyaml').version('2.2') library('metrics', 'org.xbib', 'metrics-common').version('3.0.0') library('time', 'org.xbib', 'time').version('3.0.0') - library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') } testLibs { - version('junit', '5.10.0') + version('junit', '5.10.1') library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') library('junit-jupiter-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit') library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') - library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') + library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.1') library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') library('junit4', 'junit', 'junit').version('4.13.2') }