update to Gradle 8.5

build.gradle

@@ -1,12 +1,7 @@
 plugins {
-    id "checkstyle"
-    id "pmd"
     id 'maven-publish'
     id 'signing'
     id "io.github.gradle-nexus.publish-plugin" version "2.0.0-rc-1"
-    id "com.github.spotbugs" version "6.0.0-beta.3"
-    id "org.cyclonedx.bom" version "1.7.4"
-    id "org.xbib.gradle.plugin.asciidoctor" version "3.0.0"
 }
 
 wrapper {
@@ -30,15 +25,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')
 apply from: rootProject.file('gradle/publish/forgejo.gradle')
-apply from: rootProject.file('gradle/quality/cyclonedx.gradle')

gradle.properties

@@ -1,5 +1,5 @@
 group = org.xbib
 name = database
-version = 2.0.1
+version = 2.0.2
 
 org.gradle.warning.mode = ALL

gradle/test/junit5.gradle

@@ -1,9 +1,9 @@
 dependencies {
-    testImplementation libs.junit.jupiter.api
+    testImplementation testLibs.junit.jupiter.api
-    testImplementation libs.junit.jupiter.params
+    testImplementation testLibs.junit.jupiter.params
-    testImplementation libs.hamcrest
+    testImplementation testLibs.hamcrest
-    testRuntimeOnly libs.junit.jupiter.engine
+    testRuntimeOnly testLibs.junit.jupiter.engine
-    testRuntimeOnly libs.junit.jupiter.platform.launcher
+    testRuntimeOnly testLibs.junit.jupiter.platform.launcher
 }
 
 test {

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

jdbc-connection-pool/build.gradle

@@ -1,4 +1,4 @@
 dependencies {
-    testImplementation libs.h2
+    testImplementation testLibs.h2
-    testImplementation libs.mockito.core
+    testImplementation testLibs.mockito.core
 }

jdbc-mariadb/build.gradle

@@ -2,9 +2,9 @@ dependencies {
     api project(':jdbc-query')
     implementation libs.mariadb
     testImplementation project(':jdbc-test')
-    testImplementation libs.testcontainers
+    testImplementation testLibs.testcontainers
-    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation testLibs.testcontainers.junit.jupiter
-    testImplementation libs.testcontainers.mariadb
+    testImplementation testLibs.testcontainers.mariadb
 }
 
 test {

jdbc-oracle/build.gradle

@@ -2,9 +2,9 @@ dependencies {
     api project(':jdbc-query')
     implementation libs.oracle
     testImplementation project(':jdbc-test')
-    testImplementation libs.testcontainers
+    testImplementation testLibs.testcontainers
-    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation testLibs.testcontainers.junit.jupiter
-    testImplementation libs.testcontainers.oracle.xe
+    testImplementation testLibs.testcontainers.oracle.xe
 }
 
 test {

jdbc-postgresql/build.gradle

@@ -2,9 +2,9 @@ dependencies {
     api project(':jdbc-query')
     implementation libs.postgresql
     testImplementation project(':jdbc-test')
-    testImplementation libs.testcontainers
+    testImplementation testLibs.testcontainers
-    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation testLibs.testcontainers.junit.jupiter
-    testImplementation libs.testcontainers.postgresql
+    testImplementation testLibs.testcontainers.postgresql
 }
 
 test {

jdbc-query/build.gradle

@@ -1,11 +1,11 @@
 dependencies {
     api project(':jdbc-connection-pool')
     testImplementation project(':jdbc-test')
-    testImplementation libs.derby
+    testImplementation testLibs.derby
-    testImplementation libs.hsqldb
+    testImplementation testLibs.hsqldb
-    testImplementation libs.h2
+    testImplementation testLibs.h2
-    testImplementation libs.testcontainers
+    testImplementation testLibs.testcontainers
-    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation testLibs.testcontainers.junit.jupiter
 }
 
 test {

jdbc-sqlserver/build.gradle

@@ -1,8 +1,8 @@
 dependencies {
     api project(':jdbc-query')
     testImplementation project(':jdbc-test')
-    testImplementation libs.testcontainers
+    testImplementation testLibs.testcontainers
-    testImplementation libs.testcontainers.junit.jupiter
+    testImplementation testLibs.testcontainers.junit.jupiter
 }
 
 test {

jdbc-test/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
     api project(":jdbc-query")
-    implementation libs.junit.jupiter.api
+    implementation testLibs.junit.jupiter.api
-    implementation libs.hamcrest
+    implementation testLibs.hamcrest
 }

settings.gradle

@@ -1,13 +1,18 @@
 dependencyResolutionManagement {
     versionCatalogs {
         libs {
-            version('gradle', '8.4')
+            version('gradle', '8.5')
-            version('junit', '5.10.0')
+            library('mariadb', 'org.mariadb.jdbc', 'mariadb-java-client').version('3.1.3')
+            library('oracle', 'com.oracle.database.jdbc','ojdbc11').version('23.2.0.0')
+            library('postgresql', 'org.postgresql', 'postgresql').version('42.6.0')
+        }
+        testLibs {
+            version('junit', '5.10.1')
             version('testcontainers', '1.19.1')
             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('junit-jupiter-platform-launcher', 'org.junit.platform', 'junit-platform-launcher').version('1.10.1')
             library('hamcrest', 'org.hamcrest', 'hamcrest-library').version('2.2')
             library('junit4', 'junit', 'junit').version('4.13.2')
             library('derby', 'org.apache.derby', 'derby').version('10.16.1.1')