From 56b7d35ca505c86fca6da2efe0f3edc4bee0368f Mon Sep 17 00:00:00 2001
From: Chetan Gudisagar <chetangudisagar@gmail.com>
Date: Wed, 25 Oct 2023 15:31:53 -0700
Subject: [PATCH 1/4] Rocksdb to Corfudb version fix

---
 benchmarks/build.gradle.kts | 2 --
 gradle/dependencies.gradle  | 7 ++++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/benchmarks/build.gradle.kts b/benchmarks/build.gradle.kts
index 0baf5967..7b3ea84e 100644
--- 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
index 24809e64..e1463e0d 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -21,6 +21,11 @@ repositories {
             password = System.getenv("PUBLISH_TOKEN")
         }
     }
+
+    maven {
+        name = "ossrh-staging"
+        url = uri("https://s01.oss.sonatype.org/content/repositories/orgcorfudb-1009")
+    }
 }
 
 configurations.all {
@@ -38,7 +43,7 @@ ext {
     lombokVersion = "1.18.18"
 
     jmhVersion = "1.25"
-    rocksdbVersion = "6.2.2"
+    rocksdbVersion = "8.6.7.2"
     ehcacheVersion = "3.8.0"
 
     ktorVersion = "1.3.1"

From c215fc921864e8c0e3b717adab931b7b795ce243 Mon Sep 17 00:00:00 2001
From: Chetan Gudisagar <chetangudisagar@gmail.com>
Date: Wed, 25 Oct 2023 15:43:44 -0700
Subject: [PATCH 2/4] Rocksdb to Corfudb version fix

---
 gradle/dependencies.gradle              | 6 +++---
 universe/universe-core/build.gradle.kts | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index e1463e0d..792c920c 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -23,8 +23,8 @@ repositories {
     }
 
     maven {
-        name = "ossrh-staging"
-        url = uri("https://s01.oss.sonatype.org/content/repositories/orgcorfudb-1009")
+        name = "ossrh"
+        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots")
     }
 }
 
@@ -43,7 +43,7 @@ ext {
     lombokVersion = "1.18.18"
 
     jmhVersion = "1.25"
-    rocksdbVersion = "8.6.7.2"
+    rocksdbVersion = "8.6.7.3"
     ehcacheVersion = "3.8.0"
 
     ktorVersion = "1.3.1"
diff --git a/universe/universe-core/build.gradle.kts b/universe/universe-core/build.gradle.kts
index c8fcc660..33aa1dc1 100644
--- 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")
 

From dec5efb8b29f389544a039291ddfeb45ddcfe324 Mon Sep 17 00:00:00 2001
From: Chetan Gudisagar <chetangudisagar@gmail.com>
Date: Thu, 2 Nov 2023 17:44:47 -0700
Subject: [PATCH 3/4] revert maven imports section

---
 gradle/dependencies.gradle | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 792c920c..cd699eeb 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -21,11 +21,6 @@ repositories {
             password = System.getenv("PUBLISH_TOKEN")
         }
     }
-
-    maven {
-        name = "ossrh"
-        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots")
-    }
 }
 
 configurations.all {

From 2b64a30ae69a2c2876b1bd58b6091992367a9dca Mon Sep 17 00:00:00 2001
From: Chetan Gudisagar <chetangudisagar@gmail.com>
Date: Thu, 2 Nov 2023 17:57:56 -0700
Subject: [PATCH 4/4] try sourcesets fix

---
 gradle/java.gradle | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gradle/java.gradle b/gradle/java.gradle
index 8825368a..4658106f 100644
--- 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'