Merge pull request #450 from kmgowda/kmg-release-8.0-1

Release 8.0

Author: kmgowda

README.md

@@ -391,14 +391,14 @@ As an example, just follow the below steps to see the performance graphs
 1. In the SBK directory build the 'SBK' service of the [docker compose](docker-compose.yml) file as follows.
 
    ```
-   <SBK dir>% docker-compose -f ./docker-compose-sbk-grafana.yml build 
+   <SBK dir>% docker compose -f ./docker-compose-sbk-grafana.yml build 
 
    ```
 
 1. Run the 'SBK' service as follows.
 
    ```
-   <SBK dir>% docker-compose run sbk  -class concurrentq -writers 1  -readers 5 -size 1000 -seconds 120 
+   <SBK dir>% docker compose run sbk  -class concurrentq -writers 1  -readers 5 -size 1000 -seconds 120 
 
    ```
 

build.gradle

@@ -22,9 +22,9 @@ buildscript {
         }
     }
     dependencies {
-        classpath group: 'com.github.spotbugs.snom', name: 'spotbugs-gradle-plugin', version: spotbugsPluginVersion
-        classpath group: 'gradle.plugin.com.palantir.graal', name: 'gradle-graal', version: graalvmPluginVersion
-        classpath group: 'com.google.cloud.tools.jib', name: 'com.google.cloud.tools.jib.gradle.plugin', version: jibVersion
+        classpath "com.github.spotbugs.snom:spotbugs-gradle-plugin:$spotbugsPluginVersion"
+        classpath "gradle.plugin.com.palantir.graal:gradle-graal:$graalvmPluginVersion"
+        classpath "com.google.cloud.tools.jib:com.google.cloud.tools.jib.gradle.plugin:$jibVersion"
         // classpath group: 'org.hidetake', name:'gradle-ssh-plugin', version: sshPluginVersion
         //classpath group: 'ru.vyarus', name:'gradle-mkdocs-plugin', version: mkdocsPluginVersion
     }
@@ -37,8 +37,14 @@ buildscript {
 
 plugins {
     id 'org.jreleaser' version  "${jReleaserPluginVersion}"
+    id 'com.github.ben-manes.versions' version "${gradleVersionsPluginVersion}"
 }
 
+/*
+ * to get the dependency for the drivers : ./gradlew dependencyUpdates -Drevision=release --no-parallel -PincludeDriversDeps=true
+ */
+def includeDriversDeps = (project.findProperty('includeDrivers') ?: 'false').toString().toBoolean()
+
 def SbkMainClass = "io.sbk.main.SbkMain"
 
 gradle.rootProject {
@@ -114,6 +120,20 @@ allprojects {
         }
     }
 
+    if (it.project == rootProject) {
+        // Ensure the task is disabled for root project
+        tasks.matching { it.name == 'dependencyUpdates' }.configureEach { enabled = false }
+    } else if (project.path.startsWith(':drivers')) {
+        if (includeDriversDeps) {
+            apply plugin: 'com.github.ben-manes.versions'
+        } else {
+            // Ensure the task is disabled if applied elsewhere
+            tasks.matching { it.name == 'dependencyUpdates' }.configureEach { enabled = false }
+        }
+    } else {
+        apply plugin: 'com.github.ben-manes.versions'
+    }
+
     application {
         mainClass = SbkMainClass
         applicationName = sbkProjectName
@@ -186,17 +206,18 @@ allprojects {
         }
     }
 
+    /*
     tasks.register('generateDashboards', Copy) {
         if (project.path.startsWith(":drivers")) {
             def outDir = 'build/dashboard'
             def outFile = sbkProjectName + "-" + sbkVersion + ".json"
             def sbkClassName = sbkClass.toLowerCase().capitalize()
 
-            /*
-            call with parameter
-            ./gradlew generateDashboards -Poutdir="/Users/kmg/projects/SBK/grafana/dashboards"
-            to generate dashboard files on single folder
-             */
+
+           // call with parameter
+           // ./gradlew generateDashboards -Poutdir="/Users/kmg/projects/SBK/grafana/dashboards"
+           // to generate dashboard files on single folder
+
             if (project.hasProperty("outdir")) {
                 outDir = outdir
                 outFile = sbkProjectName + ".json"
@@ -212,6 +233,7 @@ allprojects {
             }
         }
     }
+    */
 
     tasks.register('generateDockerfiles') {
         def driversToSkip = ["sbk-api", "perl", "sbm", "sbk-gem", "drivers", "sbk-yal", "sbk-gem-yal"]

docker-compose-sbk-hub.yml

@@ -11,7 +11,7 @@
 version: '3'
 services:
   prometheus:
-    image: prom/prometheus:v3.3.0
+    image: prom/prometheus:v3.7.3
     container_name: prometheus
     hostname: prometheus
     volumes:

docker-compose-static-ip.yml

@@ -11,7 +11,7 @@
 version: '3'
 services:
   prometheus:
-    image: prom/prometheus:v3.3.0
+    image: prom/prometheus:v3.7.3
     volumes:
       - ./grafana/prometheus:/etc/prometheus
     command:

docker-compose.yml

@@ -11,7 +11,7 @@
 version: '3'
 services:
   prometheus:
-    image: prom/prometheus:v3.3.0
+    image: prom/prometheus:v3.7.3
     container_name: prometheus
     hostname: prometheus
     volumes:

driver-docker-template

@@ -9,7 +9,7 @@
 ##
 
 # Building Container
-FROM gradle:8.13.0-jdk-21 as SbkGradleBuilder
+FROM gradle:9.2.0-jdk-21 as SbkGradleBuilder
 MAINTAINER Keshava Munegowda <keshava.gowda@gmail.com>
 USER root
 

drivers/activemq/src/main/java/io/sbk/driver/Activemq/ActivemqWriter.java

@@ -34,7 +34,7 @@ public ActivemqWriter(int writerID, ParameterOptions params, ActivemqConfig conf
     }
 
     @Override
-    public CompletableFuture writeAsync(String data) throws IOException {
+    public CompletableFuture<?> writeAsync(String data) throws IOException {
         try {
             this.producer.send(config.session.createTextMessage(data));
         } catch (JMSException ex) {

drivers/asyncfile/src/main/java/io/sbk/driver/AsyncFile/AsyncFileWriter.java

@@ -67,7 +67,7 @@ public void failed(Throwable exc, ByteBuffer attachment) {
 
 
     @Override
-    public CompletableFuture writeAsync(ByteBuffer data) throws IOException {
+    public CompletableFuture<?> writeAsync(ByteBuffer data) throws IOException {
         try {
             out.write(data.asReadOnlyBuffer(), pos).get();
         } catch (InterruptedException | ExecutionException ex) {

drivers/cassandra/src/main/java/io/sbk/driver/Cassandra/CassandraWriter.java

@@ -29,7 +29,7 @@ public CassandraWriter(int writerID, ParameterOptions params,
 
 
     @Override
-    public CompletableFuture writeAsync(String data) throws IOException {
+    public CompletableFuture<?> writeAsync(String data) throws IOException {
         StringBuilder sb = new StringBuilder("INSERT INTO ")
                 .append(config.keyspace).append(".").append(config.table).append(" (id, data) ")
                 .append("VALUES (").append(UUID.randomUUID())

drivers/concurrentq/src/main/java/io/sbk/driver/ConcurrentQ/CqReader.java

@@ -25,7 +25,7 @@ public class CqReader implements Reader<byte[]> {
     final private static int PARK_NS = NS_PER_MS;
     private final Queue<byte[]> queue;
 
-    public CqReader(Queue queue) throws IOException {
+    public CqReader(Queue<byte[]> queue) throws IOException {
         this.queue = queue;
     }