joerg/elx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

exclude ES JNA and replace with ours to avoid classpath hell

Browse source
This commit is contained in:
Jörg Prante 2023-10-19 18:26:01 +02:00
parent 006bd38091
commit 3428c627eb
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
elx-api/build.gradle
View file

@ -1,6 +1,8 @@
dependencies { dependencies {
api libs.metrics api libs.metrics
api libs.elasticsearch api(libs.elasticsearch) {
exclude group: 'org.elasticsearch', module: 'jna'
}
// override older artifacts in ES x-content. We must use jackson smile/cbor/yaml and log4j2 api here. // override older artifacts in ES x-content. We must use jackson smile/cbor/yaml and log4j2 api here.
api libs.jackson api libs.jackson
api libs.log4j.api api libs.log4j.api
@ -16,4 +18,6 @@ dependencies {
implementation libs.hppc implementation libs.hppc
implementation libs.joda implementation libs.joda
implementation libs.tdigest implementation libs.tdigest
// use our JNA
implementation libs.jna
} }

2
gradle.properties
View file

@ -1,5 +1,5 @@
group = org.xbib group = org.xbib
name = elx name = elx
version = 7.10.2.33 version = 7.10.2.34
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-rc-1-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

8
settings.gradle
View file

@ -1,7 +1,7 @@
dependencyResolutionManagement { dependencyResolutionManagement {
versionCatalogs { versionCatalogs {
libs { libs {
version('gradle', '8.4-rc-1') version('gradle', '8.4')
version('junit', '5.10.0') version('junit', '5.10.0')
version('elasticsearch', '7.10.2') version('elasticsearch', '7.10.2')
// ES 7.10.2 uses lucene 8.7.0 // ES 7.10.2 uses lucene 8.7.0
@ -9,9 +9,10 @@ dependencyResolutionManagement {
// ES 7.10.2 uses log4j2 2.11.1 // ES 7.10.2 uses log4j2 2.11.1
version('log4j', '2.20.0') version('log4j', '2.20.0')
// ES 7.10.2 uses netty 4.1.49 // ES 7.10.2 uses netty 4.1.49
version('netty', '4.1.98.Final') version('netty', '4.1.100.Final')
// ES 7.10.2 uses Jackson 2.10.4 // ES 7.10.2 uses Jackson 2.10.4
version('jackson', '2.15.2') version('jackson', '2.15.2')
version('net-http', '4.0.2') // must match netty version
library('junit-jupiter-api', 'org.junit.jupiter', 'junit-jupiter-api').versionRef('junit') 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-params', 'org.junit.jupiter', 'junit-jupiter-params').versionRef('junit')
library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit') library('junit-jupiter-engine', 'org.junit.jupiter', 'junit-jupiter-engine').versionRef('junit')
@ -39,9 +40,10 @@ dependencyResolutionManagement {
library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty') library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty')
library('netty-buffer', 'io.netty', 'netty-buffer').versionRef('netty') library('netty-buffer', 'io.netty', 'netty-buffer').versionRef('netty')
library('netty-transport', 'io.netty', 'netty-transport').versionRef('netty') library('netty-transport', 'io.netty', 'netty-transport').versionRef('netty')
library('net-http-netty-client', 'org.xbib', 'net-http-client-netty').version('4.0.1') library('net-http-netty-client', 'org.xbib', 'net-http-client-netty').versionRef('net-http')
library('metrics', 'org.xbib', 'metrics-common').version('3.0.0') library('metrics', 'org.xbib', 'metrics-common').version('3.0.0')
library('time', 'org.xbib', 'time').version('3.0.0') library('time', 'org.xbib', 'time').version('3.0.0')
library('jna', 'net.java.dev.jna', 'jna').version('5.13.0')
} }
} }
} }