From f8e456eb316cc45090744ae01237b92693847c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Prante?= Date: Thu, 23 May 2024 11:24:12 +0200 Subject: [PATCH] update netty to 4.1.110, jackson to 2.17.1 --- build.gradle | 8 +------- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 14 +++++++------- 4 files changed, 10 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index 5a11aa9..0b64049 100644 --- a/build.gradle +++ b/build.gradle @@ -1,18 +1,14 @@ plugins { - id "checkstyle" - id "pmd" id 'maven-publish' id 'signing' id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1" - id "com.github.spotbugs" version "6.0.0-beta.3" - id "org.cyclonedx.bom" version "1.7.4" id "org.xbib.gradle.plugin.asciidoctor" version "3.0.0" } wrapper { gradleVersion = libs.versions.gradle.get() - distributionType = Wrapper.DistributionType.ALL + distributionType = Wrapper.DistributionType.BIN } ext { @@ -34,9 +30,7 @@ subprojects { apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') - apply from: rootProject.file('gradle/quality/pmd.gradle') apply from: rootProject.file('gradle/publish/maven.gradle') } apply from: rootProject.file('gradle/publish/sonatype.gradle') apply from: rootProject.file('gradle/publish/forgejo.gradle') -apply from: rootProject.file('gradle/quality/cyclonedx.gradle') diff --git a/gradle.properties b/gradle.properties index 1116172..2d43fe5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.xbib name = elx -version = 7.10.2.41 +version = 7.10.2.42 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e7646de..b82aa23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index cbc2af4..8eed6fb 100644 --- a/settings.gradle +++ b/settings.gradle @@ -6,12 +6,12 @@ dependencyResolutionManagement { // ES 7.10.2 uses lucene 8.7.0 version('lucene', '8.7.0') // ES 7.10.2 uses log4j2 2.11.1 - version('log4j', '2.22.0') + version('log4j', '2.23.1') // ES 7.10.2 uses netty 4.1.49 - version('netty', '4.1.109.Final') + version('netty', '4.1.110.Final') // ES 7.10.2 uses Jackson 2.10.4 - version('jackson', '2.16.0') - version('net-http', '4.5.0') + version('jackson', '2.17.1') + version('net-http', '4.5.1') 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') @@ -24,9 +24,6 @@ dependencyResolutionManagement { library('lucene-queryparser', 'org.apache.lucene', 'lucene-queryparser').versionRef('lucene') library('lucene-grouping', 'org.apache.lucene', 'lucene-grouping').versionRef('lucene') library('lucene-misc', 'org.apache.lucene', 'lucene-misc').versionRef('lucene') - library('hppc', 'com.carrotsearch', 'hppc').version('0.8.1') - library('joda', 'joda-time', 'joda-time').version('2.10.4') - library('tdigest', 'com.tdunning', 't-digest').version('3.2') library('es-plugin-transport-netty4', 'org.elasticsearch.plugin', 'transport-netty4-client').versionRef('elasticsearch') library('jackson', 'com.fasterxml.jackson.core', 'jackson-core').versionRef('jackson') library('jackson.smile', 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-smile').versionRef('jackson') @@ -38,6 +35,9 @@ dependencyResolutionManagement { library('netty-transport', 'io.netty', 'netty-transport').versionRef('netty') library('jna', 'net.java.dev.jna', 'jna').version('5.14.0') library('snakeyaml', 'org.yaml', 'snakeyaml').version('2.2') + library('hppc', 'com.carrotsearch', 'hppc').version('0.8.1') + library('joda', 'joda-time', 'joda-time').version('2.10.4') + library('tdigest', 'com.tdunning', 't-digest').version('3.2') // xbib library('net-http-netty-client', 'org.xbib', 'net-http-client-netty').versionRef('net-http') library('metrics', 'org.xbib', 'metrics-common').version('4.0.0')