Support tests in apple silicon and fix NPE in BaseLogStorageTest

sofastack · Feb 18, 2025 · 5962989 · 5962989
1 parent 9029048
commit 5962989
Show file tree

Hide file tree

Showing 12 changed files with 13 additions and 12 deletions.
diff --git a/jraft-core/pom.xml b/jraft-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jraft-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
     <artifactId>jraft-core</artifactId>
     <packaging>jar</packaging>

diff --git a/jraft-example/pom.xml b/jraft-example/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jraft-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
     <artifactId>jraft-example</artifactId>
     <packaging>jar</packaging>

diff --git a/jraft-extension/bdb-log-storage-impl/pom.xml b/jraft-extension/bdb-log-storage-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-extension</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
     <artifactId>bdb-log-storage-impl</artifactId>
     <name>bdb-log-storage-impl ${project.version}</name>

diff --git a/...log-storage-impl/src/test/java/com/alipay/sofa/jraft/storage/impl/BaseLogStorageTest.java b/...log-storage-impl/src/test/java/com/alipay/sofa/jraft/storage/impl/BaseLogStorageTest.java
@@ -69,6 +69,7 @@ protected LogStorageOptions newLogStorageOptions() {
         final LogStorageOptions opts = new LogStorageOptions();
         opts.setConfigurationManager(this.confManager);
         opts.setLogEntryCodecFactory(this.logEntryCodecFactory);
+        opts.setGroupId("test");
         return opts;
     }
 

diff --git a/jraft-extension/java-log-storage-impl/pom.xml b/jraft-extension/java-log-storage-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-extension</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>java-log-storage-impl</artifactId>

diff --git a/jraft-extension/pom.xml b/jraft-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>jraft-extension</artifactId>

diff --git a/jraft-extension/rpc-grpc-impl/pom.xml b/jraft-extension/rpc-grpc-impl/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-extension</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>rpc-grpc-impl</artifactId>

diff --git a/jraft-rheakv/pom.xml b/jraft-rheakv/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>jraft-rheakv</artifactId>

diff --git a/jraft-rheakv/rheakv-core/pom.xml b/jraft-rheakv/rheakv-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-rheakv</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>jraft-rheakv-core</artifactId>

diff --git a/jraft-rheakv/rheakv-pd/pom.xml b/jraft-rheakv/rheakv-pd/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>jraft-rheakv</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
 
     <artifactId>jraft-rheakv-pd</artifactId>

diff --git a/jraft-test/pom.xml b/jraft-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jraft-parent</artifactId>
         <groupId>com.alipay.sofa</groupId>
-        <version>1.3.15.bugfix</version>
+        <version>1.3.16</version>
     </parent>
     <artifactId>jraft-test</artifactId>
     <packaging>jar</packaging>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>jraft-parent</artifactId>
-    <version>1.3.15.bugfix</version>
+    <version>1.3.16</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -63,7 +63,7 @@
         <java.target.version>1.8</java.target.version>
         <jctools.version>2.1.1</jctools.version>
         <jmh.version>1.20</jmh.version>
-        <jna.version>5.5.0</jna.version>
+        <jna.version>5.7.0</jna.version>
         <jsr305.version>3.0.2</jsr305.version>
         <junit.dep.version>4.8.2</junit.dep.version>
         <junit.version>4.13.1</junit.version>