Skip to content

Commit 196dc23

Browse files
committed
Fix compilation
1 parent db13e91 commit 196dc23

File tree

11 files changed

+15
-19
lines changed

11 files changed

+15
-19
lines changed

build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description = "Experiments with Java"
99

1010
allprojects {
1111
group = "io.github.mfvanek"
12-
version = "0.5.0"
12+
version = "0.5.1"
1313

1414
repositories {
1515
mavenCentral()
@@ -19,7 +19,7 @@ allprojects {
1919

2020
tasks {
2121
wrapper {
22-
gradleVersion = "8.14.3"
22+
gradleVersion = "9.1.0"
2323
}
2424
}
2525

buildSrc/build.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ repositories {
77
}
88

99
dependencies {
10-
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
10+
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.3.0")
1111
implementation("io.freefair.gradle:lombok-plugin:9.0.0")
1212
implementation("com.bmuschko:gradle-docker-plugin:9.4.0")
1313
implementation("gradle.plugin.com.google.gradle:osdetector-gradle-plugin:1.7.3")
1414
implementation("de.thetaphi:forbiddenapis:3.10")
15-
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.13")
16-
implementation("org.gradle:test-retry-gradle-plugin:1.6.2")
15+
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.4")
16+
implementation("org.gradle:test-retry-gradle-plugin:1.6.4")
1717
val kotlinVersion = "2.0.21"
1818
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
1919
implementation("org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion")

buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ dependencies {
3737
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
3838
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3939

40-
errorprone("com.google.errorprone:error_prone_core:2.39.0")
40+
errorprone("com.google.errorprone:error_prone_core:2.42.0")
4141
errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.29")
4242

4343
spotbugsPlugins("jp.skypencil.findbugs.slf4j:bug-pattern:1.5.0")
4444
spotbugsPlugins("com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0")
45-
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.11")
45+
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.15")
4646
}
4747

4848
checkstyle {
@@ -61,7 +61,7 @@ pmd {
6161
}
6262

6363
spotbugs {
64-
toolVersion.set("4.9.3")
64+
toolVersion.set("4.9.8")
6565
showProgress.set(true)
6666
effort.set(Effort.MAX)
6767
reportLevel.set(Confidence.LOW)

common-internal-bom/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ javaPlatform {
1717

1818
dependencies {
1919
api(platform("org.assertj:assertj-bom:3.27.6"))
20-
api(platform("org.testcontainers:testcontainers-bom:1.21.3"))
20+
api(platform("org.testcontainers:testcontainers-bom:2.0.1"))
2121
api(platform("org.junit:junit-bom:6.0.0"))
2222
api(platform("io.github.mfvanek:pg-index-health-bom:0.30.0"))
2323

gradle/wrapper/gradle-wrapper.jar

1.65 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
114114
NONSTOP* ) nonstop=true ;;
115115
esac
116116

117-
CLASSPATH="\\\"\\\""
118117

119118

120119
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
172171
# For Cygwin or MSYS, switch paths to Windows format before running java
173172
if "$cygwin" || "$msys" ; then
174173
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
175-
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
176174

177175
JAVACMD=$( cygpath --unix "$JAVACMD" )
178176

@@ -212,7 +210,6 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
212210

213211
set -- \
214212
"-Dorg.gradle.appname=$APP_BASE_NAME" \
215-
-classpath "$CLASSPATH" \
216213
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
217214
"$@"
218215

gradlew.bat

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,10 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=
7473

7574

7675
@rem Execute Gradle
77-
"%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" %*
76+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7877

7978
:end
8079
@rem End local scope for the variables with windows NT shell

spring-boot-3-demo-app-kotlin/src/test/kotlin/io/github/mfvanek/spring/boot3/kotlin/test/DatabaseStructureStaticAnalysisTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ internal class DatabaseStructureStaticAnalysisTest : TestBase() {
3333
.filter { obj: DatabaseCheckOnHost<out DbObject>? -> obj!!.isStatic }
3434
.forEach { check: DatabaseCheckOnHost<out DbObject>? ->
3535
assertThat(check!!.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault()))
36-
.`as`(check.diagnostic.name)
36+
.`as`(check.name)
3737
.isEmpty()
3838
}
3939
}

spring-boot-3-demo-app-reactive/src/test/java/io/github/mfvanek/spring/boot3/reactive/DatabaseStructureStaticAnalysisTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ void databaseStructureCheckForPublicSchema() {
4343
.filter(DatabaseCheckOnHost::isStatic)
4444
.forEach(check ->
4545
assertThat(check.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault()))
46-
.as(check.getDiagnostic().name())
46+
.as(check.getName())
4747
.isEmpty());
4848
}
4949
}

0 commit comments

Comments
 (0)