Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "Experiments with Java"

allprojects {
group = "io.github.mfvanek"
version = "0.4.0"
version = "0.4.1"

repositories {
mavenLocal()
Expand All @@ -19,7 +19,7 @@ allprojects {

tasks {
wrapper {
gradleVersion = "8.13"
gradleVersion = "8.14.2"
}
}

Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ repositories {
}

dependencies {
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.2.0")
implementation("io.freefair.gradle:lombok-plugin:8.13.1")
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.9")
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7")
implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.13")
implementation("org.gradle:test-retry-gradle-plugin:1.6.2")
val kotlinVersion = "2.0.21"
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
Expand Down
11 changes: 6 additions & 5 deletions buildSrc/src/main/kotlin/sb-ot-demo.java-conventions.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,31 @@ dependencies {
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

errorprone("com.google.errorprone:error_prone_core:2.36.0")
errorprone("jp.skypencil.errorprone.slf4j:errorprone-slf4j:0.1.28")
errorprone("com.google.errorprone:error_prone_core:2.38.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.13.0")
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.9")
spotbugsPlugins("com.mebigfatguy.sb-contrib:sb-contrib:7.6.10")
}

checkstyle {
toolVersion = "10.21.1"
toolVersion = "10.24.0"
configFile = file("${rootDir}/config/checkstyle/checkstyle.xml")
isIgnoreFailures = false
maxWarnings = 0
maxErrors = 0
}

pmd {
toolVersion = "7.9.0"
toolVersion = "7.14.0"
isConsoleOutput = true
ruleSetFiles = files("${rootDir}/config/pmd/pmd.xml")
ruleSets = listOf()
}

spotbugs {
toolVersion.set("4.9.3")
showProgress.set(true)
effort.set(Effort.MAX)
reportLevel.set(Confidence.LOW)
Expand Down
4 changes: 2 additions & 2 deletions common-internal-bom/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ javaPlatform {
dependencies {
api(platform("org.assertj:assertj-bom:3.27.3"))
api(platform("org.testcontainers:testcontainers-bom:1.21.1"))
api(platform("org.junit:junit-bom:5.13.0"))
api(platform("io.github.mfvanek:pg-index-health-bom:0.14.6"))
api(platform("org.junit:junit-bom:5.13.1"))
api(platform("io.github.mfvanek:pg-index-health-bom:0.15.0"))

constraints {
api("org.liquibase:liquibase-core:4.32.0")
Expand Down
6 changes: 3 additions & 3 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]
detekt = "1.23.8"
spring-boot-v3 = "3.4.4"
spring-boot-v3 = "3.4.6"

[libraries]
detekt = { group = "io.gitlab.arturbosch.detekt", name = "detekt-gradle-plugin", version.ref = "detekt" }
detekt-formatting = { group = "io.gitlab.arturbosch.detekt", name = "detekt-formatting", version.ref = "detekt" }
detekt-libraries = { group = "io.gitlab.arturbosch.detekt", name = "detekt-rules-libraries", version.ref = "detekt" }
spring-boot-v3-dependencies = { group = "org.springframework.boot", name = "spring-boot-dependencies", version.ref = "spring-boot-v3" }
springdoc-openapi = "org.springdoc:springdoc-openapi:2.8.6"
springdoc-openapi = "org.springdoc:springdoc-openapi-bom:2.8.8"
spring-cloud = "org.springframework.cloud:spring-cloud-dependencies:2024.0.1"
datasource-micrometer = "net.ttddyy.observation:datasource-micrometer-spring-boot:1.1.1"
logstash = "net.logstash.logback:logstash-logback-encoder:8.0"
logstash = "net.logstash.logback:logstash-logback-encoder:8.1"

[plugins]
spring-boot-v3 = { id = "org.springframework.boot", version.ref = "spring-boot-v3" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 2 additions & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
CLASSPATH="\\\"\\\""


# Determine the Java command to use to start the JVM.
Expand Down Expand Up @@ -213,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"

# Stop when "xargs" is not available.
Expand Down
4 changes: 2 additions & 2 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ goto fail
:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
set CLASSPATH=


@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%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" %*

:end
@rem End local scope for the variables with windows NT shell
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void databaseStructureCheckForPublicSchema() {
checks.stream()
.filter(DatabaseCheckOnHost::isStatic)
.forEach(check ->
assertThat(check.check(PgContext.ofPublic(), SkipLiquibaseTablesPredicate.ofPublic()))
assertThat(check.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault()))
.as(check.getDiagnostic().name())
.isEmpty());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void cleanUpDatabase() {

@Order(1)
@Test
void spanShouldBeReportedInLogs(@Nonnull final CapturedOutput output) throws Exception {
void spanShouldBeReportedInLogs(@Nonnull final CapturedOutput output) throws InterruptedException {
stubOkResponse(ParsedDateTime.from(LocalDateTime.now(clock).minusDays(1)));

final EntityExchangeResult<LocalDateTime> result = webTestClient.get()
Expand Down
2 changes: 1 addition & 1 deletion spring-boot-3-demo-app-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ tasks {
limit {
counter = "INSTRUCTION"
value = "COVEREDRATIO"
minimum = "0.92".toBigDecimal()
minimum = "0.90".toBigDecimal()
}
}
rule {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ class IndexesMaintenanceTest : TestBase() {
.hasSameSizeAs(Diagnostic.entries.toTypedArray())

checks
.filter { obj: DatabaseCheckOnHost<out DbObject?>? -> obj!!.isStatic }
.forEach { check: DatabaseCheckOnHost<out DbObject?>? ->
assertThat(check!!.check(PgContext.ofPublic(), SkipLiquibaseTablesPredicate.ofPublic()))
.filter { obj: DatabaseCheckOnHost<out DbObject>? -> obj!!.isStatic }
.forEach { check: DatabaseCheckOnHost<out DbObject>? ->
assertThat(check!!.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault()))
.`as`(check.diagnostic.name)
.isEmpty()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ void databaseStructureCheckForPublicSchema() {
checks.stream()
.filter(DatabaseCheckOnHost::isStatic)
.forEach(check ->
assertThat(check.check(PgContext.ofPublic(), SkipLiquibaseTablesPredicate.ofPublic()))
assertThat(check.check(PgContext.ofDefault(), SkipLiquibaseTablesPredicate.ofDefault()))
.as(check.getDiagnostic().name())
.isEmpty());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ void cleanUpDatabase() {

@Order(1)
@Test
void spanShouldBeReportedInLogs(@Nonnull final CapturedOutput output) throws Exception {
void spanShouldBeReportedInLogs(@Nonnull final CapturedOutput output) throws InterruptedException {
stubOkResponse(ParsedDateTime.from(LocalDateTime.now(clock).minusDays(1)));

final EntityExchangeResult<LocalDateTime> result = webTestClient.get()
Expand Down