FMWK-453 Upgrade to aerospike-client-jdk8 version 8.1.2 (#22)

* FMWK-453 Upgrade to aerospike-client-jdk8 version 8.1.2 * handle undefined security-severity in snyk-scan workflow
aerospike · Jun 30, 2024 · b2452ba · b2452ba
1 parent c8ed85a
commit b2452ba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/snyk-scan.yml b/.github/workflows/snyk-scan.yml
@@ -22,6 +22,10 @@ jobs:
         with:
           args: --all-projects --sarif-file-output=snyk.sarif
 
+      - name: Handle undefined security-severity
+        run: |
+          sed -i 's/"security-severity": "undefined"/"security-severity": "0"/g' snyk.sarif
+
       - name: Check output file
         id: out-file
         run: |
@@ -32,6 +36,6 @@ jobs:
 
       - name: Upload result to GitHub Code Scanning
         if: steps.out-file.outputs.exists == 'true'
-        uses: github/codeql-action/upload-sarif@v2
+        uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snyk.sarif
diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <name>aerospike-client-java-reactive</name>
     <description>aerospike-client-java-reactive</description>
     <url>https://github.com/aerospike/aerospike-client-java-reactive</url>
-    <version>7.1.0</version>
+    <version>8.1.2</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -29,11 +29,11 @@
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
 
-        <aerospike-client.version>7.1.0</aerospike-client.version>
-        <netty.version>4.1.97.Final</netty.version>
+        <aerospike-client.version>8.1.2</aerospike-client.version>
+        <netty.version>4.1.111.Final</netty.version>
         <commons-cli.version>1.5.0</commons-cli.version>
         <junit.version>4.13.2</junit.version>
-        <slf4j-api.version>2.0.7</slf4j-api.version>
+        <slf4j-api.version>2.0.13</slf4j-api.version>
     </properties>
 
     <licenses>
@@ -69,7 +69,7 @@
         <dependencies>
             <dependency>
                 <groupId>com.aerospike</groupId>
-                <artifactId>aerospike-client</artifactId>
+                <artifactId>aerospike-client-jdk8</artifactId>
                 <version>${aerospike-client.version}</version>
             </dependency>
 

diff --git a/reactor-client/pom.xml b/reactor-client/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>com.aerospike</groupId>
         <artifactId>aerospike-client-java-reactive</artifactId>
-        <version>7.1.0</version>
+        <version>8.1.2</version>
     </parent>
     <artifactId>aerospike-reactor-client</artifactId>
     <packaging>jar</packaging>
@@ -19,7 +19,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <reactor.version>3.5.8</reactor.version>
+        <reactor.version>3.6.7</reactor.version>
         <assertj.version>3.24.2</assertj.version>
         <netcrusher.version>0.10</netcrusher.version>
 
@@ -30,7 +30,7 @@
     <dependencies>
         <dependency>
             <groupId>com.aerospike</groupId>
-            <artifactId>aerospike-client</artifactId>
+            <artifactId>aerospike-client-jdk8</artifactId>
         </dependency>
 
         <dependency>

diff --git a/reactor-client/src/test/java/com/aerospike/client/reactor/ReactorInfoTest.java b/reactor-client/src/test/java/com/aerospike/client/reactor/ReactorInfoTest.java
@@ -1,12 +1,11 @@
 package com.aerospike.client.reactor;
 
-import com.aerospike.client.AerospikeException;
 import com.aerospike.client.reactor.util.Args;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-public class ReactorInfoTest extends ReactorTest{
+public class ReactorInfoTest extends ReactorTest {
 
     public ReactorInfoTest(Args args) {
         super(args);
@@ -28,9 +27,7 @@ public void shouldFailOnUnknownCommand() {
         Mono<String> mono = reactorClient.info(null, null, "XXX");
 
         StepVerifier.create(mono)
-                .expectErrorMatches(throwable -> throwable instanceof AerospikeException
-                        && throwable.getMessage().equals("Error -1: Unknown info command: [XXX]"))
-                .verify();
+                .expectNext("ERROR:4:unrecognized command")
+                .verifyComplete();
     }
-
 }
diff --git a/reactor-client/src/test/java/com/aerospike/client/reactor/retry/RetryTest.java b/reactor-client/src/test/java/com/aerospike/client/reactor/retry/RetryTest.java
@@ -9,6 +9,7 @@
 import com.aerospike.client.cdt.ListOperation;
 import com.aerospike.client.cdt.ListReturnType;
 import com.aerospike.client.policy.BatchPolicy;
+import com.aerospike.client.policy.Policy;
 import com.aerospike.client.query.IndexCollectionType;
 import com.aerospike.client.query.IndexType;
 import com.aerospike.client.query.Statement;
@@ -44,11 +45,11 @@ public class RetryTest {
     public static final Operation[] OPS = new Operation[]{ListOperation.size(LIST_BIN), ListOperation.getByIndex(LIST_BIN, -1, ListReturnType.VALUE)};
 
     public static final AerospikeException.Connection NO_CONNECTION = new AerospikeException.Connection(ResultCode.NO_MORE_CONNECTIONS, "1");
-    public static final AerospikeException.Timeout TIMEOUT = new AerospikeException.Timeout(1, false);
+    public static final AerospikeException.Timeout TIMEOUT = new AerospikeException.Timeout(new Policy(), false);
 
-    private IAerospikeReactorClient reactorClient = mock(IAerospikeReactorClient.class);
+    private final IAerospikeReactorClient reactorClient = mock(IAerospikeReactorClient.class);
 
-    private IAerospikeReactorClient retryClient = new AerospikeReactorRetryClient(reactorClient,
+    private final IAerospikeReactorClient retryClient = new AerospikeReactorRetryClient(reactorClient,
             retryOnNoMoreConnections());
 
     @Test