From 3428c627eb7474cdd6347dd42d443d12338109ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Prante?= <joergprante@gmail.com>
Date: Thu, 19 Oct 2023 18:26:01 +0200
Subject: [PATCH] exclude ES JNA and replace with ours to avoid classpath hell

---
 elx-api/build.gradle                     | 6 +++++-
 gradle.properties                        | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 2 +-
 settings.gradle                          | 8 +++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/elx-api/build.gradle b/elx-api/build.gradle
index b4a9e61..ce354f8 100644
--- a/elx-api/build.gradle
+++ b/elx-api/build.gradle
@@ -1,6 +1,8 @@
 dependencies {
     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.
     api libs.jackson
     api libs.log4j.api
@@ -16,4 +18,6 @@ dependencies {
     implementation libs.hppc
     implementation libs.joda
     implementation libs.tdigest
+    // use our JNA
+    implementation libs.jna
 }
diff --git a/gradle.properties b/gradle.properties
index a8ca944..473f25b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,5 +1,5 @@
 group = org.xbib
 name = elx
-version = 7.10.2.33
+version = 7.10.2.34
 
 org.gradle.warning.mode = ALL
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e30733a..8838ba9 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.4-rc-1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index 5aaeb33..2b4290a 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.4-rc-1')
+            version('gradle', '8.4')
             version('junit', '5.10.0')
             version('elasticsearch', '7.10.2')
             // ES 7.10.2 uses lucene 8.7.0
@@ -9,9 +9,10 @@ dependencyResolutionManagement {
             // 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.98.Final')
+            version('netty', '4.1.100.Final')
             // ES 7.10.2 uses Jackson 2.10.4
             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-params', 'org.junit.jupiter', 'junit-jupiter-params').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-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('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('time', 'org.xbib', 'time').version('3.0.0')
+            library('jna', 'net.java.dev.jna', 'jna').version('5.13.0')
         }
     }
 }