Skip to content

Commit 7ab7ddd

Browse files
authored
[ISSUE #9609] Fix bazel CI and reduce dependencies (#9610)
1 parent e6a587a commit 7ab7ddd

File tree

27 files changed

+63
-52
lines changed

27 files changed

+63
-52
lines changed

.bazelrc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,8 @@ build:remote --platforms=@buildbuddy_toolchain//:platform
4747
build:remote --extra_execution_platforms=@buildbuddy_toolchain//:platform
4848
build:remote --crosstool_top=@buildbuddy_toolchain//:toolchain
4949
build:remote --extra_toolchains=@buildbuddy_toolchain//:cc_toolchain
50-
build:remote --javabase=@buildbuddy_toolchain//:javabase_jdk8
51-
build:remote --host_javabase=@buildbuddy_toolchain//:javabase_jdk8
52-
build:remote --java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
53-
build:remote --host_java_toolchain=@buildbuddy_toolchain//:toolchain_jdk8
50+
build:remote --java_language_version=8
51+
build:remote --java_runtime_version=8
5452
build:remote --define=EXECUTOR=remote
5553

5654
# Enable remote execution so actions are performed on the remote systems.

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
6.5.0

BUILD.bazel

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,6 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
load("@bazel_toolchains//rules/exec_properties:exec_properties.bzl", "create_rbe_exec_properties_dict")
18-
19-
platform(
20-
name = "custom_platform",
21-
# Inherit from the platform target generated by 'rbe_configs_gen' assuming the generated configs
22-
# were imported as a Bazel external repository named 'rbe_default'. If you extracted the
23-
# generated configs elsewhere in your source repository, replace the following with the label
24-
# to the 'platform' target in the generated configs.
25-
parents = ["@rbe_default//config:platform"],
26-
# Example custom execution property instructing RBE to use e2-standard-2 GCE VMs.
27-
exec_properties = create_rbe_exec_properties_dict(
28-
container_image = "ubuntu:latest",
29-
),
30-
)
3117

3218
java_library(
3319
name = "test_deps",

WORKSPACE

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ maven_install(
6464
"org.awaitility:awaitility:4.1.0",
6565
"commons-cli:commons-cli:1.5.0",
6666
"com.google.guava:guava:31.0.1-jre",
67-
"org.yaml:snakeyaml:1.30",
67+
"org.yaml:snakeyaml:2.0",
6868
"commons-codec:commons-codec:1.13",
6969
"commons-io:commons-io:2.7",
7070
"com.google.truth:truth:0.30",
@@ -134,11 +134,31 @@ load("@io_buildbuddy_buildbuddy_toolchain//:rules.bzl", "buildbuddy")
134134
buildbuddy(name = "buildbuddy_toolchain")
135135

136136
http_archive(
137-
name = "bazel_toolchains",
138-
sha256 = "1adf5db506a7e3c465a26988514cfc3971af6d5b3c2218925cd6e71ee443fc3f",
139-
strip_prefix = "bazel-toolchains-4.0.0",
137+
name = "bazel_skylib",
138+
sha256 = "51b5105a760b353773f904d2bbc5e664d0987fbaf22265164de65d43e910d8ac",
140139
urls = [
141-
"https://github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
142-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/releases/download/4.0.0/bazel-toolchains-4.0.0.tar.gz",
140+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
141+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.8.1/bazel-skylib-1.8.1.tar.gz",
143142
],
144143
)
144+
145+
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
146+
bazel_skylib_workspace()
147+
148+
http_archive(
149+
name = "rules_java",
150+
urls = [
151+
"https://github.com/bazelbuild/rules_java/releases/download/7.12.5/rules_java-7.12.5.tar.gz",
152+
],
153+
sha256 = "17b18cb4f92ab7b94aa343ce78531b73960b1bed2ba166e5b02c9fdf0b0ac270",
154+
)
155+
load("@rules_java//java:repositories.bzl", "rules_java_dependencies", "rules_java_toolchains")
156+
rules_java_dependencies()
157+
rules_java_toolchains()
158+
159+
load("@rules_java//toolchains:local_java_repository.bzl", "local_java_repository")
160+
local_java_repository(
161+
name = "jdk8",
162+
version = "8",
163+
java_home = "/usr/lib/jvm/java-8-openjdk-amd64",
164+
)

auth/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ java_library(
2323
deps = [
2424
"//common",
2525
"//remoting",
26-
"//srvutil",
2726
"//client",
2827
"@maven//:commons_codec_commons_codec",
2928
"@maven//:org_apache_commons_commons_lang3",

bazel/GenTestRules.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def GenTestRules(
6666
runtime_deps = deps,
6767
resources = resources,
6868
size = test_size,
69-
jvm_flags = jvm_flags,
69+
jvm_flags = jvm_flags + ["-Dbuild.bazel=true"],
7070
args = args,
7171
flaky = flaky,
7272
tags = tags,

broker/src/main/java/org/apache/rocketmq/broker/metrics/BrokerMetricsManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ public class BrokerMetricsManager {
162162
public static LongCounter rollBackMessagesTotal = new NopLongCounter();
163163
public static LongHistogram transactionFinishLatency = new NopLongHistogram();
164164

165+
@SuppressWarnings("DoubleBraceInitialization")
165166
public static final List<String> SYSTEM_GROUP_PREFIX_LIST = new ArrayList<String>() {
166167
{
167168
add(MixAll.CID_RMQ_SYS_PREFIX.toLowerCase());

broker/src/test/java/org/apache/rocketmq/broker/offset/ConsumerOffsetManagerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public class ConsumerOffsetManagerTest {
4040
private ConsumerOffsetManager consumerOffsetManager;
4141

4242
@Before
43+
@SuppressWarnings("DoubleBraceInitialization")
4344
public void init() {
4445
brokerController = Mockito.mock(BrokerController.class);
4546
consumerOffsetManager = new ConsumerOffsetManager(brokerController);

broker/src/test/java/org/apache/rocketmq/broker/offset/RocksDBConsumerOffsetManagerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public class RocksDBConsumerOffsetManagerTest {
4141
private ConsumerOffsetManager consumerOffsetManager;
4242

4343
@Before
44+
@SuppressWarnings("DoubleBraceInitialization")
4445
public void init() {
4546
if (notToBeExecuted()) {
4647
return;

client/BUILD.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,5 +68,6 @@ GenTestRules(
6868
],
6969
exclude_tests = [
7070
"src/test/java/org/apache/rocketmq/client/consumer/DefaultLitePullConsumerTest",
71+
"src/test/java/org/apache/rocketmq/client/impl/mqclient/MQClientAPITest",
7172
],
7273
)

0 commit comments

Comments
 (0)