From 1f21e557905e351c6ed3add19596b43517939dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Prante?= <joergprante@gmail.com>
Date: Thu, 28 Sep 2023 17:31:09 +0200
Subject: [PATCH] update to jackson 2.15.2

---
 elx-api/build.gradle                                     | 2 +-
 elx-http/src/main/java/org/xbib/elx/http/HttpAction.java | 4 +++-
 gradle.properties                                        | 2 +-
 gradle/test/junit5.gradle                                | 4 ++--
 settings.gradle                                          | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/elx-api/build.gradle b/elx-api/build.gradle
index 93445e2..b4a9e61 100644
--- a/elx-api/build.gradle
+++ b/elx-api/build.gradle
@@ -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.
diff --git a/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java b/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java
index 3ebafba..29d77e0 100644
--- a/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java
+++ b/elx-http/src/main/java/org/xbib/elx/http/HttpAction.java
@@ -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) {
diff --git a/gradle.properties b/gradle.properties
index 9de806e..6bd0354 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group = org.xbib
 name = elx
-version = 7.10.2.31
+version = 7.10.2.32
 
 org.gradle.warning.mode = ALL
diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle
index 6e6ae7e..f2a19b6 100644
--- a/gradle/test/junit5.gradle
+++ b/gradle/test/junit5.gradle
@@ -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
diff --git a/settings.gradle b/settings.gradle
index 86fce16..10f9844 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -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')
         }