Merge pull request #435 from kmgowda/kmg-lib-1

libraries update for sonatype check Signed-off-by: Keshava Munegowda <[email protected]>
kmgowda · Aug 15, 2024 · 429df8d · 429df8d
2 parents 3f13d12 + 7a564fb
commit 429df8d
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 19 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -26,7 +26,7 @@ mkdocsPluginVersion=2.1.1
 spotbugsVersion=4.7.3
 grpcVersion=1.58.1
 protobufGradlePlugin=0.9.4
-protobufProtocVersion=3.25.2
+protobufProtocVersion=3.25.4
 checkstyleToolVersion=9.0
 apacheRatVersion=0.8.0
 jacocoVersion=0.8.10
@@ -36,13 +36,14 @@ junitVersion=4.13.2
 mockitoVersion=5.5.0
 lombokVersion=1.18.28
 commonsCliVersion=1.5.0
-apacheCommonsVersion=1.9.0
+apacheCommonsConfigVersion=2.11.0
+apacheCommonsConfigCsvVersion=1.11.0
+apacheCommonsLang3Version=3.16.0
 reflectionsVersion=0.10.2
 micrometerVersion=1.11.3
-commonsConfigurationVersion=1.10
 guavaVersion=32.1.2-jre
 fasterxmlVersion=2.15.2
-sshdVersion=2.10.0
+sshdVersion=2.13.2
 HdrHistogramVersion=2.1.12
 jetbrainVersion=24.0.1
 jmxPrometheusVersion=0.20.0

diff --git a/perl/build.gradle b/perl/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     api group: 'org.projectlombok', name: 'lombok', version: lombokVersion
     api group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: spotbugsVersion
     api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
-    api group: 'org.apache.commons', name: 'commons-csv', version: apacheCommonsVersion
+    api group: 'org.apache.commons', name: 'commons-csv', version: apacheCommonsConfigCsvVersion
     api group: 'org.hdrhistogram', name: 'HdrHistogram', version: HdrHistogramVersion
     api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
     api group: 'org.slf4j', name: 'slf4j-simple', version: slf4jVersion

diff --git a/sbk-api/build.gradle b/sbk-api/build.gradle
@@ -36,7 +36,10 @@ dependencies {
     api project(":perl")
     annotationProcessor group: 'org.projectlombok', name: 'lombok', version: lombokVersion
     api group: 'org.reflections', name: 'reflections', version: reflectionsVersion
-    api group: 'commons-configuration', name: 'commons-configuration', version: commonsConfigurationVersion
+    api group: 'org.apache.commons', name: 'commons-configuration2', version: apacheCommonsConfigVersion
+    // https://mvnrepository.com/artifact/org.apache.commons/commons-lang3
+    api group: 'org.apache.commons', name: 'commons-lang3', version: apacheCommonsLang3Version
+
     implementation group: 'org.jetbrains', name: 'annotations', version: jetbrainVersion
 }
 

diff --git a/sbk-api/src/main/java/io/sbk/api/Package.java b/sbk-api/src/main/java/io/sbk/api/Package.java
@@ -11,7 +11,7 @@
 package io.sbk.api;
 
 import io.sbk.system.Printer;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/sbk-api/src/main/java/io/sbk/api/impl/Sbk.java b/sbk-api/src/main/java/io/sbk/api/impl/Sbk.java
@@ -32,7 +32,7 @@
 import io.time.Time;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/sbk-api/src/main/java/io/sbk/api/impl/SbkBenchmark.java b/sbk-api/src/main/java/io/sbk/api/impl/SbkBenchmark.java
@@ -28,7 +28,7 @@
 import io.state.State;
 import io.time.Time;
 import lombok.Synchronized;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.concurrent.GuardedBy;

diff --git a/sbk-gem-yal/src/main/java/io/gem/api/impl/SbkGemYal.java b/sbk-gem-yal/src/main/java/io/gem/api/impl/SbkGemYal.java
@@ -24,7 +24,7 @@
 import io.sbk.params.impl.SbkYalParameters;
 import io.sbk.utils.SbkUtils;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -37,7 +37,7 @@
 /**
  * Class SbkGemYal.
  */
-public final class SbkGemYal {
+final public class SbkGemYal {
     final static String CONFIG_FILE = "gem-yal.properties";
     final static String NAME = "sbk-gem-yal";
     final static String DESC = "Storage Benchmark Kit-Group Execution Monitor-YML Arguments Loader";

diff --git a/sbk-gem/src/main/java/io/gem/api/SshUtils.java b/sbk-gem/src/main/java/io/gem/api/SshUtils.java
@@ -10,7 +10,7 @@
 
 package io.gem.api;
 
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.channel.ChannelExec;
 import org.apache.sshd.client.channel.ClientChannelEvent;

diff --git a/sbk-gem/src/main/java/io/gem/api/impl/SbkGem.java b/sbk-gem/src/main/java/io/gem/api/impl/SbkGem.java
@@ -45,7 +45,7 @@
 import io.time.Time;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/sbk-gem/src/main/java/io/gem/api/impl/SbkGemBenchmark.java b/sbk-gem/src/main/java/io/gem/api/impl/SbkGemBenchmark.java
@@ -22,7 +22,7 @@
 import io.sbk.system.Printer;
 import io.state.State;
 import lombok.Synchronized;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.concurrent.GuardedBy;

diff --git a/sbk-gem/src/main/java/io/gem/main/SbkGemMain.java b/sbk-gem/src/main/java/io/gem/main/SbkGemMain.java
@@ -22,7 +22,7 @@
 /**
  * Class SbkGemMain.
  */
-public final class SbkGemMain {
+final public class SbkGemMain {
 
     /**
      * This method is the main method of Sbk-Gem module.

diff --git a/sbk-gem/src/main/java/io/gem/params/impl/SbkGemParameters.java b/sbk-gem/src/main/java/io/gem/params/impl/SbkGemParameters.java
@@ -20,7 +20,7 @@
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;

diff --git a/sbk-yal/src/main/java/io/sbk/api/impl/SbkYal.java b/sbk-yal/src/main/java/io/sbk/api/impl/SbkYal.java
@@ -23,7 +23,7 @@
 import io.sbk.params.impl.SbkYmlMap;
 import io.sbk.utils.SbkUtils;
 import org.apache.commons.cli.ParseException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;

diff --git a/sbm/src/main/java/io/sbm/api/impl/Sbm.java b/sbm/src/main/java/io/sbm/api/impl/Sbm.java
@@ -30,7 +30,7 @@
 import io.time.Time;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;

diff --git a/sbm/src/main/java/io/sbm/params/impl/SbmParameters.java b/sbm/src/main/java/io/sbm/params/impl/SbmParameters.java
@@ -19,7 +19,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.cli.UnrecognizedOptionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Arrays;