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
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
id("org.hypertrace.ci-utils-plugin") version "0.4.0"
id("org.hypertrace.publish-plugin") version "1.1.1" apply false
id("org.hypertrace.code-style-plugin") version "2.1.2" apply false
id("org.hypertrace.java-convention") version "0.4.0"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our java convention plugin decouples the build from the current java version. By default, it uses java 21 to compile but targets compatibility with 11. The current issue is that it's using whatever version was used to run gradle, and CI's default version was updated to 17 by GH.

id("org.owasp.dependencycheck") version "12.1.0"
}

Expand Down
1 change: 0 additions & 1 deletion document-store/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ dependencies {

testImplementation(libs.org.junit.jupiter.junit.jupiter)
testImplementation(libs.org.mockito.mockito.core)
testImplementation(libs.org.mockito.mockito.inline)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newer versions of mockito have this built in. The old version was not compatible with newer java.

testImplementation(libs.org.mockito.mockito.junit.jupiter)

integrationTestImplementation(libs.org.junit.jupiter.junit.jupiter)
Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[versions]
org-jacoco = "0.8.8"
org-jetbrains-kotlin = "1.7.10"
org-mockito = "5.2.0"
org-mockito = "5.8.0"
org-testcontainers = "1.17.6"

[libraries]
Expand All @@ -24,7 +24,6 @@ org-jetbrains-kotlin-kotlin-stdlib-jdk7 = { module = "org.jetbrains.kotlin:kotli
org-jetbrains-kotlin-kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "org-jetbrains-kotlin" }
org-junit-jupiter-junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version = "5.9.2" }
org-mockito-mockito-core = { module = "org.mockito:mockito-core", version.ref = "org-mockito" }
org-mockito-mockito-inline = { module = "org.mockito:mockito-inline", version.ref = "org-mockito" }
org-mockito-mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "org-mockito" }
org-mongodb-mongodb-driver-sync = { module = "org.mongodb:mongodb-driver-sync", version = "5.2.0" }
org-postgresql = { module = "org.postgresql:postgresql", version = "42.5.5" }
Expand Down