diff --git a/gradle.properties b/gradle.properties index f5e2a78..e41f641 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ group = org.xbib name = elx -version = 7.10.2.39 +version = 7.10.2.40 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d64cd49..e644113 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e6aba25..e7646de 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.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 6689b85..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail diff --git a/settings.gradle b/settings.gradle index e1be287..e0a6cec 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,17 +1,17 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.5') + version('gradle', '8.7') 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.22.0') // ES 7.10.2 uses netty 4.1.49 - version('netty', '4.1.107.Final') + version('netty', '4.1.109.Final') // ES 7.10.2 uses Jackson 2.10.4 version('jackson', '2.16.0') - version('net-http', '4.2.0') // beware, net-http must match netty version + version('net-http', '4.5.0') 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') @@ -36,14 +36,15 @@ 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').versionRef('net-http') library('jna', 'net.java.dev.jna', 'jna').version('5.14.0') library('snakeyaml', 'org.yaml', 'snakeyaml').version('2.2') + // xbib + 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') } testLibs { - version('junit', '5.10.1') + version('junit', '5.10.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')