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

update to jackson 2.15.2

Browse source
This commit is contained in:
Jörg Prante 2023-09-28 17:31:09 +02:00
parent 68a35ea86f
commit 1f21e55790
5 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
elx-api/build.gradle
View file

@ -1,7 +1,7 @@
dependencies {
api libs.metrics
api libs.elasticsearch
// override old 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.log4j.api
// add dependencies which are not managed by elasticsearch as a runtime dependency.

4
elx-http/src/main/java/org/xbib/elx/http/HttpAction.java
View file

@ -141,7 +141,9 @@ public abstract class HttpAction<R extends ActionRequest, T extends ActionRespon
}
protected HttpRequestBuilder newRequest(HttpMethod method, String baseUrl, String path, BytesReference content) {
return HttpRequest.builder(method).setURL(URL.from(baseUrl).resolve(path)).content(content.toBytesRef().bytes, APPLICATION_JSON);
return HttpRequest.builder(method)
.setURL(URL.from(baseUrl).resolve(path))
.content(content.toBytesRef().bytes, APPLICATION_JSON);
}
protected HttpRequestBuilder newRequest(HttpMethod method, String baseUrl, String path, String content) {

2
gradle.properties
View file

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

4
gradle/test/junit5.gradle
View file

@ -9,15 +9,15 @@ test {
useJUnitPlatform()
jvmArgs = [
// gradle default of 512m is too less for ES bulk indexing
'-Xms1g',
'-Xmx2g',
'-Xms2g',
// for Lucene to access jdk.internal.ref and jdk.internal.misc in Java 11+
'--add-exports=java.base/jdk.internal.ref=ALL-UNNAMED',
'--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED',
'--add-opens=java.base/java.nio=ALL-UNNAMED'
]
systemProperty 'java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager'
systemProperty 'io.netty.tryReflectionSetAccessible', 'true'
systemProperty 'io.netty.tryReflectionSetAccessible', 'false'
systemProperty 'jna.debug_load', 'true'
systemProperty 'path.home', "${project.buildDir}/"
failFast = false

8
settings.gradle
View file

@ -2,16 +2,16 @@ dependencyResolutionManagement {
versionCatalogs {
libs {
version('gradle', '8.1.1')
version('junit', '5.9.3')
version('junit', '5.10.0')
version('elasticsearch', '7.10.2')
// 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.20.0')
// ES 7.10.2 uses netty 4.1.49
version('netty', '4.1.93.Final')
version('netty', '4.1.98.Final')
// ES 7.10.2 uses Jackson 2.10.4
version('jackson', '2.14.2')
version('jackson', '2.15.2')
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')
@ -38,7 +38,7 @@ dependencyResolutionManagement {
library('netty-handler', 'io.netty', 'netty-handler').versionRef('netty')
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').version('3.0.5')
library('net-http-netty-client', 'org.xbib', 'net-http-client-netty').version('3.7.3')
library('metrics', 'org.xbib', 'metrics-common').version('3.0.0')
library('time', 'org.xbib', 'time').version('3.0.0')
}