Rocksdb to Corfudb version fix (#263)

* Rocksdb to Corfudb version fix * Rocksdb to Corfudb version fix * revert maven imports section * try sourcesets fix
CorfuDB · Nov 3, 2023 · bdf0a11 · bdf0a11
1 parent 45a4f52
commit bdf0a11
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
@@ -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
 
@@ -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}")

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -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"

diff --git a/gradle/java.gradle b/gradle/java.gradle
@@ -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'
 

diff --git a/universe/universe-core/build.gradle.kts b/universe/universe-core/build.gradle.kts
@@ -26,6 +26,7 @@ version = "1.0.0-SNAPSHOT"
 
 val corfuVersion = project.ext["corfuVersion"]
 
+
 dependencies {
     implementation("com.spotify:docker-client:8.16.0")
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