diff --git a/build.gradle b/build.gradle index df077ec..66f43f8 100644 --- a/build.gradle +++ b/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') diff --git a/gradle.properties b/gradle.properties index 62b20f3..7bf820a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib name = database -version = 2.0.1 +version = 2.0.2 org.gradle.warning.mode = ALL diff --git a/gradle/test/junit5.gradle b/gradle/test/junit5.gradle index 50a7eaf..74ddf15 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 { 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/jdbc-connection-pool/build.gradle b/jdbc-connection-pool/build.gradle index 1495992..43af545 100644 --- a/jdbc-connection-pool/build.gradle +++ b/jdbc-connection-pool/build.gradle @@ -1,4 +1,4 @@ dependencies { - testImplementation libs.h2 - testImplementation libs.mockito.core + testImplementation testLibs.h2 + testImplementation testLibs.mockito.core } diff --git a/jdbc-mariadb/build.gradle b/jdbc-mariadb/build.gradle index d6c9019..e14e38d 100644 --- a/jdbc-mariadb/build.gradle +++ b/jdbc-mariadb/build.gradle @@ -2,9 +2,9 @@ dependencies { api project(':jdbc-query') implementation libs.mariadb testImplementation project(':jdbc-test') - testImplementation libs.testcontainers - testImplementation libs.testcontainers.junit.jupiter - testImplementation libs.testcontainers.mariadb + testImplementation testLibs.testcontainers + testImplementation testLibs.testcontainers.junit.jupiter + testImplementation testLibs.testcontainers.mariadb } test { diff --git a/jdbc-oracle/build.gradle b/jdbc-oracle/build.gradle index 4881904..d68f4ac 100644 --- a/jdbc-oracle/build.gradle +++ b/jdbc-oracle/build.gradle @@ -2,9 +2,9 @@ dependencies { api project(':jdbc-query') implementation libs.oracle testImplementation project(':jdbc-test') - testImplementation libs.testcontainers - testImplementation libs.testcontainers.junit.jupiter - testImplementation libs.testcontainers.oracle.xe + testImplementation testLibs.testcontainers + testImplementation testLibs.testcontainers.junit.jupiter + testImplementation testLibs.testcontainers.oracle.xe } test { diff --git a/jdbc-postgresql/build.gradle b/jdbc-postgresql/build.gradle index 7214212..847c705 100644 --- a/jdbc-postgresql/build.gradle +++ b/jdbc-postgresql/build.gradle @@ -2,9 +2,9 @@ dependencies { api project(':jdbc-query') implementation libs.postgresql testImplementation project(':jdbc-test') - testImplementation libs.testcontainers - testImplementation libs.testcontainers.junit.jupiter - testImplementation libs.testcontainers.postgresql + testImplementation testLibs.testcontainers + testImplementation testLibs.testcontainers.junit.jupiter + testImplementation testLibs.testcontainers.postgresql } test { diff --git a/jdbc-query/build.gradle b/jdbc-query/build.gradle index 1f334c1..1377c3f 100644 --- a/jdbc-query/build.gradle +++ b/jdbc-query/build.gradle @@ -1,11 +1,11 @@ dependencies { api project(':jdbc-connection-pool') testImplementation project(':jdbc-test') - testImplementation libs.derby - testImplementation libs.hsqldb - testImplementation libs.h2 - testImplementation libs.testcontainers - testImplementation libs.testcontainers.junit.jupiter + testImplementation testLibs.derby + testImplementation testLibs.hsqldb + testImplementation testLibs.h2 + testImplementation testLibs.testcontainers + testImplementation testLibs.testcontainers.junit.jupiter } test { diff --git a/jdbc-sqlserver/build.gradle b/jdbc-sqlserver/build.gradle index 4574a9f..749572c 100644 --- a/jdbc-sqlserver/build.gradle +++ b/jdbc-sqlserver/build.gradle @@ -1,8 +1,8 @@ dependencies { api project(':jdbc-query') testImplementation project(':jdbc-test') - testImplementation libs.testcontainers - testImplementation libs.testcontainers.junit.jupiter + testImplementation testLibs.testcontainers + testImplementation testLibs.testcontainers.junit.jupiter } test { diff --git a/jdbc-test/build.gradle b/jdbc-test/build.gradle index a9a12e6..6b790df 100644 --- a/jdbc-test/build.gradle +++ b/jdbc-test/build.gradle @@ -1,5 +1,5 @@ dependencies { api project(":jdbc-query") - implementation libs.junit.jupiter.api - implementation libs.hamcrest + implementation testLibs.junit.jupiter.api + implementation testLibs.hamcrest } diff --git a/settings.gradle b/settings.gradle index fe94300..241719f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,13 +1,18 @@ dependencyResolutionManagement { versionCatalogs { libs { - version('gradle', '8.4') - version('junit', '5.10.0') + version('gradle', '8.5') + 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')