[rocketmq] branch develop updated: [ISSUE #5783] Fix compilation warning (#5784)

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

lizhanhui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 8e2ee2381 [ISSUE #5783] Fix compilation warning (#5784)
8e2ee2381 is described below

commit 8e2ee23819ba752b6a940d9b05171a9675bc4d13
Author: Zhanhui Li <li...@apache.org>
AuthorDate: Fri Dec 30 11:01:17 2022 +0800

    [ISSUE #5783] Fix compilation warning (#5784)
    
    * Fix compilation warning
    
    Signed-off-by: Li Zhanhui <li...@gmail.com>
    
    * Skip unstable test case HATest#testSemiSyncReplicaWhenSlaveActingMaster on macOS
    
    Signed-off-by: Li Zhanhui <li...@gmail.com>
    
    Signed-off-by: Li Zhanhui <li...@gmail.com>
---
 WORKSPACE                                                 | 1 +
 proxy/BUILD.bazel                                         | 2 ++
 store/src/test/java/org/apache/rocketmq/store/HATest.java | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/WORKSPACE b/WORKSPACE
index 640dd1dc4..394f8766e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -94,6 +94,7 @@ maven_install(
         "io.opentelemetry:opentelemetry-sdk-common:1.19.0",
         "io.github.aliyunmq:rocketmq-slf4j-api:1.0.0",
         "io.github.aliyunmq:rocketmq-logback-classic:1.0.0",
+	"org.jetbrains:annotations:23.1.0",
     ],
     fetch_sources = True,
     repositories = [
diff --git a/proxy/BUILD.bazel b/proxy/BUILD.bazel
index 539132af9..ab13e05a5 100644
--- a/proxy/BUILD.bazel
+++ b/proxy/BUILD.bazel
@@ -74,6 +74,7 @@ java_library(
     ],
     visibility = ["//visibility:public"],
     deps = [
+	"//acl",
         ":proxy",
         "//:test_deps",
         "//broker",
@@ -99,6 +100,7 @@ java_library(
         "@maven//:org_checkerframework_checker_qual",
         "@maven//:org_slf4j_slf4j_api",
         "@maven//:org_springframework_spring_core",
+	"@maven//:org_jetbrains_annotations",
     ],
 )
 
diff --git a/store/src/test/java/org/apache/rocketmq/store/HATest.java b/store/src/test/java/org/apache/rocketmq/store/HATest.java
index 028c9b10e..e1dc16bdc 100644
--- a/store/src/test/java/org/apache/rocketmq/store/HATest.java
+++ b/store/src/test/java/org/apache/rocketmq/store/HATest.java
@@ -29,6 +29,7 @@ import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.rocketmq.common.BrokerConfig;
+import org.apache.rocketmq.common.MixAll;
 import org.apache.rocketmq.common.UtilAll;
 import org.apache.rocketmq.common.message.MessageDecoder;
 import org.apache.rocketmq.common.message.MessageExt;
@@ -39,6 +40,7 @@ import org.apache.rocketmq.store.config.MessageStoreConfig;
 import org.apache.rocketmq.store.ha.HAConnectionState;
 import org.apache.rocketmq.store.stats.BrokerStatsManager;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -160,6 +162,8 @@ public class HATest {
 
     @Test
     public void testSemiSyncReplicaWhenSlaveActingMaster() throws Exception {
+        // SKip MacOS
+        Assume.assumeFalse(MixAll.isMac());
         long totalMsgs = 5;
         queueTotal = 1;
         messageBody = storeMessage.getBytes();