diff --git a/build.gradle.kts b/build.gradle.kts index 88ae1b97..7b597ffd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,7 +9,7 @@ description = "Experiments with Java" allprojects { group = "io.github.mfvanek" - version = "0.5.0" + version = "0.5.1" repositories { mavenCentral() @@ -19,7 +19,7 @@ allprojects { tasks { wrapper { - gradleVersion = "8.14.3" + gradleVersion = "9.1.0" } } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 2ec1debe..156a0c42 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -7,13 +7,13 @@ repositories { } dependencies { - implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0") + implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0") implementation("io.freefair.gradle:lombok-plugin:9.0.0") implementation("com.bmuschko:gradle-docker-plugin:9.4.0") implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3") implementation("de.thetaphi:forbiddenapis:3.10") - implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.13") - implementation("org.gradle:test-retry-gradle-plugin:1.6.2") + implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.4") + implementation("org.gradle:test-retry-gradle-plugin:1.6.4") val kotlinVersion = "2.0.21" implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") implementation("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion") diff --git a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts index a053984e..11c0d5c6 100644 --- a/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts @@ -37,12 +37,12 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine") testRuntimeOnly("org.junit.platform:junit-platform-launcher") - errorprone("com.google.errorprone:error_prone_core:2.39.0") + errorprone("com.google.errorprone:error_prone_core:2.42.0") errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.29") spotbugsPlugins("jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0") spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0") - spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.11") + spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.15") } checkstyle { @@ -61,7 +61,7 @@ pmd { } spotbugs { - toolVersion.set("4.9.3") + toolVersion.set("4.9.8") showProgress.set(true) effort.set(Effort.MAX) reportLevel.set(Confidence.LOW) diff --git a/common-internal-bom/build.gradle.kts b/common-internal-bom/build.gradle.kts index 016f3d37..5d2734b3 100644 --- a/common-internal-bom/build.gradle.kts +++ b/common-internal-bom/build.gradle.kts @@ -17,9 +17,9 @@ javaPlatform { dependencies { api(platform("org.assertj:assertj-bom:3.27.6")) - api(platform("org.testcontainers:testcontainers-bom:1.21.3")) + api(platform("org.testcontainers:testcontainers-bom:2.0.1")) api(platform("org.junit:junit-bom:6.0.0")) - api(platform("io.github.mfvanek:pg-index-health-bom:0.20.3")) + api(platform("io.github.mfvanek:pg-index-health-bom:0.30.0")) constraints { api("org.liquibase:liquibase-core:5.0.1") diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1b33c55b..8bdaf60c 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 d4081da4..2e111328 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.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 23d15a93..adff685a 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -114,7 +114,6 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -172,7 +171,6 @@ fi # For Cygwin or MSYS, switch paths to Windows format before running java if "$cygwin" || "$msys" ; then APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) JAVACMD=$( cygpath --unix "$JAVACMD" ) @@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ - -classpath "$CLASSPATH" \ -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" diff --git a/gradlew.bat b/gradlew.bat index db3a6ac2..c4bdd3ab 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,10 @@ goto fail :execute @rem Setup the command line -set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/DatabaseStructureStaticAnalysisTest.kt b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/DatabaseStructureStaticAnalysisTest.kt index 75111f66..09748194 100644 --- a/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/DatabaseStructureStaticAnalysisTest.kt +++ b/spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/DatabaseStructureStaticAnalysisTest.kt @@ -33,7 +33,7 @@ internal class DatabaseStructureStaticAnalysisTest : TestBase() { .filter { obj: DatabaseCheckOnHost? -> obj!!.isStatic } .forEach { check: DatabaseCheckOnHost? -> assertThat(check!!.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault())) - .`as`(check.diagnostic.name) + .`as`(check.name) .isEmpty() } } diff --git a/spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/DatabaseStructureStaticAnalysisTest.java b/spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/DatabaseStructureStaticAnalysisTest.java index 88012845..bb26d2e1 100644 --- a/spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/DatabaseStructureStaticAnalysisTest.java +++ b/spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/DatabaseStructureStaticAnalysisTest.java @@ -43,7 +43,7 @@ void databaseStructureCheckForPublicSchema() { .filter(DatabaseCheckOnHost::isStatic) .forEach(check -> assertThat(check.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault())) - .as(check.getDiagnostic().name()) + .as(check.getName()) .isEmpty()); } } diff --git a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/DatabaseStructureStaticAnalysisTest.java b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/DatabaseStructureStaticAnalysisTest.java index 1266eb84..0e4bb31f 100644 --- a/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/DatabaseStructureStaticAnalysisTest.java +++ b/spring-boot-3-demo-app/src/test/java/io/github/mfvanek/spring/boot3/test/DatabaseStructureStaticAnalysisTest.java @@ -43,7 +43,7 @@ void databaseStructureCheckForPublicSchema() { .filter(DatabaseCheckOnHost::isStatic) .forEach(check -> assertThat(check.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault())) - .as(check.getDiagnostic().name()) + .as(check.getName()) .isEmpty()); } }