Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rocksdb to Corfudb version fix #263

Merged
merged 4 commits into from
Nov 3, 2023
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
2 changes: 0 additions & 2 deletions benchmarks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ val nettyVersion = project.ext["nettyVersion"] as String
val assertjVersion = project.ext["assertjVersion"] as String
val lombokVersion = project.ext["lombokVersion"] as String
val jmhSdkVersion = project.ext["jmhVersion"] as String
val rocksdbVersion = project.ext["rocksdbVersion"] as String
val ehcacheVersion = project.ext["ehcacheVersion"] as String
val guavaVersion = project.ext["guavaVersion"] as String

Expand Down Expand Up @@ -66,7 +65,6 @@ dependencies {

implementation("org.openjdk.jmh:jmh-core:${jmhSdkVersion}")

implementation("org.rocksdb:rocksdbjni:${rocksdbVersion}")
implementation("org.ehcache:ehcache:${ehcacheVersion}")

implementation("org.assertj:assertj-core:${assertjVersion}")
Expand Down
2 changes: 1 addition & 1 deletion gradle/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ext {
lombokVersion = "1.18.18"

jmhVersion = "1.25"
rocksdbVersion = "6.2.2"
rocksdbVersion = "8.6.7.3"
ehcacheVersion = "3.8.0"

ktorVersion = "1.3.1"
Expand Down
9 changes: 9 additions & 0 deletions gradle/java.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ java {
withSourcesJar()
}

sourceSets.all {
configurations.getByName(runtimeClasspathConfigurationName) {
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
}
configurations.getByName(compileClasspathConfigurationName) {
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
}
}

dependencies {
implementation 'org.slf4j:slf4j-api:1.7.30'

Expand Down
1 change: 1 addition & 0 deletions universe/universe-core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ version = "1.0.0-SNAPSHOT"

val corfuVersion = project.ext["corfuVersion"]


dependencies {
implementation("com.spotify:docker-client:8.16.0")

Expand Down
Loading