diff --git a/build.gradle b/build.gradle index 39f1792..5a11aa9 100644 --- a/build.gradle +++ b/build.gradle @@ -31,13 +31,10 @@ ext { } subprojects { - //apply from: rootProject.file('gradle/ide/idea.gradle') apply from: rootProject.file('gradle/repositories/maven.gradle') apply from: rootProject.file('gradle/compile/java.gradle') apply from: rootProject.file('gradle/test/junit5.gradle') - apply from: rootProject.file('gradle/quality/checkstyle.gradle') apply from: rootProject.file('gradle/quality/pmd.gradle') - //apply from: rootProject.file('gradle/quality/spotbugs.gradle') apply from: rootProject.file('gradle/publish/maven.gradle') } apply from: rootProject.file('gradle/publish/sonatype.gradle') diff --git a/gradle.properties b/gradle.properties index 473f25b..f484d46 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = elx -version = 7.10.2.34 +version = 7.10.2.35 org.gradle.warning.mode = ALL diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 32a5cdc..e728205 100644 --- a/gradle/test/junit5.gradle +++ b/gradle/test/junit5.gradle @@ -1,9 +1,9 @@ dependencies { - testImplementation libs.junit.jupiter.api - testImplementation libs.junit.jupiter.params - testImplementation libs.hamcrest - testRuntimeOnly libs.junit.jupiter.engine - testRuntimeOnly libs.junit.jupiter.platform.launcher + testImplementation testLibs.junit.jupiter.api + testImplementation testLibs.junit.jupiter.params + testImplementation testLibs.hamcrest + testRuntimeOnly testLibs.junit.jupiter.engine + testRuntimeOnly testLibs.junit.jupiter.platform.launcher } test { @@ -20,7 +20,7 @@ test { systemProperty 'java.util.logging.manager', 'org.apache.logging.log4j.jul.LogManager' systemProperty 'io.netty.tryReflectionSetAccessible', 'false' systemProperty 'jna.debug_load', 'true' - systemProperty 'path.home', "${project.buildDir}/" + systemProperty 'path.home', "${project.getLayout().getBuildDirectory().get().toString()}/" failFast = false testLogging { events 'STARTED', 'PASSED', 'FAILED', 'SKIPPED' diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 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 8838ba9..e6aba25 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 2b4290a..b48267a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,24 +1,17 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.4') - version('junit', '5.10.0') + version('gradle', '8.5') 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') + version('log4j', '2.22.0') // ES 7.10.2 uses netty 4.1.49 - version('netty', '4.1.100.Final') + version('netty', '4.1.101.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') - library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') - library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') - library('junit4', 'junit', 'junit').version('4.13.2') + version('net-http', '4.0.6') // must match netty version 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') @@ -45,6 +38,15 @@ dependencyResolutionManagement { library('time', 'org.xbib', 'time').version('3.0.0') library('jna', 'net.java.dev.jna', 'jna').version('5.13.0') } + testLibs { + version('junit', '5.10.0') + 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') + library('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.0') + library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2') + library('junit4', 'junit', 'junit').version('4.13.2') + } } }