diff --git a/WORKSPACE b/WORKSPACE index 1abb19ea2a2..067cb3083b3 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -38,21 +38,32 @@ rules_jvm_external_setup() load("@rules_jvm_external//:defs.bzl", "maven_install") maven_install( + version_conflict_policy = "pinned", artifacts = [ "junit:junit:4.13.2", - "com.alibaba:fastjson:1.2.76", + "com.alibaba:fastjson:1.2.83", "com.alibaba.fastjson2:fastjson2:2.0.59", "org.hamcrest:hamcrest-library:1.3", - "io.netty:netty-all:4.1.65.Final", + "io.netty:netty-buffer:4.1.130.Final", + "io.netty:netty-transport:4.1.130.Final", + "io.netty:netty-handler:4.1.130.Final", + "io.netty:netty-handler-proxy:4.1.130.Final", + "io.netty:netty-codec:4.1.130.Final", + "io.netty:netty-codec-http:4.1.130.Final", + "io.netty:netty-codec-http2:4.1.130.Final", + "io.netty:netty-codec-haproxy:4.1.130.Final", + "io.netty:netty-transport-native-epoll:4.1.130.Final", + "io.netty:netty-resolver:4.1.130.Final", + "io.netty:netty-common:4.1.130.Final", "org.assertj:assertj-core:3.22.0", "org.mockito:mockito-core:3.10.0", "org.powermock:powermock-module-junit4:2.0.9", "org.powermock:powermock-api-mockito2:2.0.9", "org.powermock:powermock-core:2.0.9", "com.github.luben:zstd-jni:1.5.2-2", - "org.lz4:lz4-java:1.8.0", - "commons-validator:commons-validator:1.7", - "org.apache.commons:commons-lang3:3.12.0", + "at.yawk.lz4:lz4-java:1.10.3", + "commons-validator:commons-validator:1.10.0", + "org.apache.commons:commons-lang3:3.20.0", "org.hamcrest:hamcrest-core:1.3", "io.openmessaging.storage:dledger:0.3.2", "net.java.dev.jna:jna:4.2.2", @@ -63,17 +74,17 @@ maven_install( "commons-collections:commons-collections:3.2.2", "org.awaitility:awaitility:4.1.0", "commons-cli:commons-cli:1.5.0", - "com.google.guava:guava:31.0.1-jre", + "com.google.guava:guava:32.0.1-jre", "org.yaml:snakeyaml:2.0", "commons-codec:commons-codec:1.13", - "commons-io:commons-io:2.7", + "commons-io:commons-io:2.14.0", "com.google.truth:truth:0.30", - "org.bouncycastle:bcpkix-jdk15on:1.69", - "com.google.code.gson:gson:2.8.9", + "org.bouncycastle:bcpkix-jdk18on:1.83", + "com.google.code.gson:gson:2.9.0", "com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2", "org.apache.rocketmq:rocketmq-proto:2.1.2", - "com.google.protobuf:protobuf-java:3.20.1", - "com.google.protobuf:protobuf-java-util:3.20.1", + "com.google.protobuf:protobuf-java:3.21.7", + "com.google.protobuf:protobuf-java-util:3.21.7", "com.conversantmedia:disruptor:1.2.10", "org.apache.tomcat:annotations-api:6.0.53", "com.google.code.findbugs:jsr305:3.0.2", @@ -82,19 +93,22 @@ maven_install( "org.openjdk.jmh:jmh-core:1.19", "org.openjdk.jmh:jmh-generator-annprocess:1.19", "com.github.ben-manes.caffeine:caffeine:2.9.3", - "io.grpc:grpc-services:1.47.0", - "io.grpc:grpc-netty-shaded:1.47.0", - "io.grpc:grpc-context:1.47.0", - "io.grpc:grpc-stub:1.47.0", - "io.grpc:grpc-api:1.47.0", - "io.grpc:grpc-testing:1.47.0", - "org.springframework:spring-core:5.3.26", + "io.grpc:grpc-services:1.53.0", + "io.grpc:grpc-netty-shaded:1.53.0", + "io.grpc:grpc-netty:1.53.0", + "io.grpc:grpc-context:1.53.0", + "io.grpc:grpc-stub:1.53.0", + "io.grpc:grpc-api:1.53.0", + "io.grpc:grpc-protobuf:1.53.0", + "io.grpc:grpc-testing:1.53.0", + "org.springframework:spring-core:5.3.27", "io.opentelemetry:opentelemetry-exporter-otlp:1.47.0", "io.opentelemetry:opentelemetry-exporter-prometheus:1.47.0-alpha", "io.opentelemetry:opentelemetry-exporter-logging:1.47.0", "io.opentelemetry:opentelemetry-sdk:1.47.0", "io.opentelemetry:opentelemetry-exporter-logging-otlp:1.47.0", - "com.squareup.okio:okio-jvm:3.0.0", + "io.opentelemetry:opentelemetry-context:1.47.0", + "com.squareup.okio:okio-jvm:3.4.0", "io.opentelemetry:opentelemetry-api:1.47.0", "io.opentelemetry:opentelemetry-sdk-metrics:1.47.0", "io.opentelemetry:opentelemetry-sdk-common:1.47.0", @@ -110,11 +124,13 @@ maven_install( "org.apache.rocketmq:rocketmq-rocksdb:1.0.6", "com.alipay.sofa:jraft-core:1.3.14", "com.alipay.sofa:hessian:3.3.6", - "io.netty:netty-tcnative-boringssl-static:2.0.48.Final", "org.mockito:mockito-junit-jupiter:4.11.0", "com.alibaba.fastjson2:fastjson2:2.0.59", "org.junit.jupiter:junit-jupiter-api:5.9.1", ], + override_targets = { + "com.google.protobuf:protobuf-javalite": "@maven//:com_google_protobuf_protobuf_java", + }, fetch_sources = False, repositories = [ "https://repo1.maven.org/maven2", diff --git a/auth/BUILD.bazel b/auth/BUILD.bazel index 942a0e93d7a..4abc741396b 100644 --- a/auth/BUILD.bazel +++ b/auth/BUILD.bazel @@ -32,9 +32,19 @@ java_library( "@maven//:org_slf4j_slf4j_api", "@maven//:com_github_ben_manes_caffeine_caffeine", "@maven//:io_grpc_grpc_api", + "@maven//:io_grpc_grpc_protobuf", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:org_apache_rocketmq_rocketmq_rocksdb", ], @@ -59,9 +69,19 @@ java_library( "@maven//:org_slf4j_slf4j_api", "@maven//:com_github_ben_manes_caffeine_caffeine", "@maven//:io_grpc_grpc_api", + "@maven//:io_grpc_grpc_protobuf", "@maven//:com_google_protobuf_protobuf_java", "@maven//:com_google_protobuf_protobuf_java_util", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:org_apache_rocketmq_rocketmq_rocksdb", ], diff --git a/broker/BUILD.bazel b/broker/BUILD.bazel index ffd2bea14c5..a633cd878d6 100644 --- a/broker/BUILD.bazel +++ b/broker/BUILD.bazel @@ -39,7 +39,16 @@ java_library( "@maven//:commons_collections_commons_collections", "@maven//:commons_io_commons_io", "@maven//:commons_validator_commons_validator", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_openmessaging_storage_dledger", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", @@ -52,7 +61,7 @@ java_library( "@maven//:io_opentelemetry_opentelemetry_sdk_metrics", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_codec_commons_codec", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", "@maven//:io_github_aliyunmq_rocketmq_logback_classic", "@maven//:org_slf4j_jul_to_slf4j", @@ -85,7 +94,16 @@ java_library( "@maven//:com_alibaba_fastjson2_fastjson2", "@maven//:org_slf4j_slf4j_api", "@maven//:com_google_guava_guava", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_codec_commons_codec", "@maven//:commons_io_commons_io", diff --git a/client/BUILD.bazel b/client/BUILD.bazel index 3bd84606a29..d21ed18ce63 100644 --- a/client/BUILD.bazel +++ b/client/BUILD.bazel @@ -26,9 +26,18 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:com_alibaba_fastjson2_fastjson2", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentracing_opentracing_api", "@maven//:commons_collections_commons_collections", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", @@ -49,7 +58,16 @@ java_library( "//common", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentracing_opentracing_api", "@maven//:io_opentracing_opentracing_mock", "@maven//:org_awaitility_awaitility", diff --git a/common/BUILD.bazel b/common/BUILD.bazel index 8aeeb2f24fc..cb6cdac34e1 100644 --- a/common/BUILD.bazel +++ b/common/BUILD.bazel @@ -27,7 +27,16 @@ java_library( "@maven//:commons_collections_commons_collections", "@maven//:commons_codec_commons_codec", "@maven//:commons_validator_commons_validator", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", "@maven//:io_opentelemetry_opentelemetry_exporter_otlp", @@ -39,7 +48,7 @@ java_library( "@maven//:io_grpc_grpc_api", "@maven//:io_grpc_grpc_context", "@maven//:org_apache_commons_commons_lang3", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", "@maven//:io_github_aliyunmq_rocketmq_logback_classic", "@maven//:org_apache_rocketmq_rocketmq_rocksdb", @@ -56,7 +65,16 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:com_alibaba_fastjson2_fastjson2", "@maven//:commons_codec_commons_codec", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", "@maven//:io_opentelemetry_opentelemetry_exporter_otlp", diff --git a/container/BUILD.bazel b/container/BUILD.bazel index b828c4c431e..cca463f4b00 100644 --- a/container/BUILD.bazel +++ b/container/BUILD.bazel @@ -34,8 +34,17 @@ java_library( "@maven//:commons_collections_commons_collections", "@maven//:commons_codec_commons_codec", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", - "@maven//:io_netty_netty_all", + "@maven//:at_yawk_lz4_lz4_java", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:org_slf4j_slf4j_api", "@maven//:ch_qos_logback_logback_core", @@ -62,7 +71,16 @@ java_library( "@maven//:io_openmessaging_storage_dledger", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", ], resources = glob(["src/test/resources/certs/*.pem"]) + glob(["src/test/resources/certs/*.key"]) diff --git a/controller/BUILD.bazel b/controller/BUILD.bazel index 652dbd4d0c1..43fb9f88f90 100644 --- a/controller/BUILD.bazel +++ b/controller/BUILD.bazel @@ -30,9 +30,18 @@ java_library( "@maven//:commons_collections_commons_collections", "@maven//:commons_codec_commons_codec", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:com_alibaba_fastjson2_fastjson2", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:org_slf4j_slf4j_api", "@maven//:ch_qos_logback_logback_core", @@ -68,7 +77,16 @@ java_library( "@maven//:io_openmessaging_storage_dledger", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:com_alibaba_fastjson2_fastjson2", ], diff --git a/filter/BUILD.bazel b/filter/BUILD.bazel index 76e3ef43de8..812c92a3663 100644 --- a/filter/BUILD.bazel +++ b/filter/BUILD.bazel @@ -25,8 +25,17 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", - "@maven//:io_netty_netty_all", + "@maven//:at_yawk_lz4_lz4_java", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", ], ) @@ -41,7 +50,16 @@ java_library( "//remoting", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", ], resources = glob(["src/test/resources/certs/*.pem"]) + glob(["src/test/resources/certs/*.key"]) ) diff --git a/namesrv/BUILD.bazel b/namesrv/BUILD.bazel index 435fc29a7f8..5a4812d9e86 100644 --- a/namesrv/BUILD.bazel +++ b/namesrv/BUILD.bazel @@ -30,13 +30,22 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:com_alibaba_fastjson2_fastjson2", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:ch_qos_logback_logback_classic", "@maven//:ch_qos_logback_logback_core", "@maven//:org_slf4j_slf4j_api", - "@maven//:org_bouncycastle_bcpkix_jdk15on", + "@maven//:org_bouncycastle_bcpkix_jdk18on", "@maven//:commons_cli_commons_cli", "@maven//:com_google_guava_guava", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", @@ -58,7 +67,16 @@ java_library( "//:test_deps", "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_cli_commons_cli", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:com_google_guava_guava", "@maven//:com_alibaba_fastjson2_fastjson2", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", diff --git a/proxy/BUILD.bazel b/proxy/BUILD.bazel index c0655ec6980..e98386c43c9 100644 --- a/proxy/BUILD.bazel +++ b/proxy/BUILD.bazel @@ -42,10 +42,21 @@ java_library( "@maven//:commons_validator_commons_validator", "@maven//:io_grpc_grpc_api", "@maven//:io_grpc_grpc_context", + "@maven//:io_grpc_grpc_protobuf", "@maven//:io_grpc_grpc_netty_shaded", "@maven//:io_grpc_grpc_services", "@maven//:io_grpc_grpc_stub", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_codec_haproxy", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_github_aliyunmq_rocketmq_grpc_netty_codec_haproxy", "@maven//:io_openmessaging_storage_dledger", "@maven//:io_opentelemetry_opentelemetry_api", @@ -59,7 +70,7 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:org_apache_rocketmq_rocketmq_proto", "@maven//:org_checkerframework_checker_qual", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:org_slf4j_slf4j_api", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", "@maven//:org_slf4j_jul_to_slf4j", @@ -94,9 +105,20 @@ java_library( "@maven//:com_google_protobuf_protobuf_java_util", "@maven//:io_grpc_grpc_api", "@maven//:io_grpc_grpc_context", + "@maven//:io_grpc_grpc_protobuf", "@maven//:io_grpc_grpc_netty_shaded", "@maven//:io_grpc_grpc_stub", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_codec_haproxy", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_github_aliyunmq_rocketmq_grpc_netty_codec_haproxy", "@maven//:org_apache_commons_commons_lang3", "@maven//:io_opentelemetry_opentelemetry_exporter_otlp", @@ -108,7 +130,6 @@ java_library( "@maven//:org_springframework_spring_core", "@maven//:org_jetbrains_annotations", "@maven//:org_slf4j_jul_to_slf4j", - "@maven//:io_netty_netty_tcnative_boringssl_static", "@maven//:commons_codec_commons_codec", ], ) @@ -118,6 +139,7 @@ GenTestRules( exclude_tests = [ "src/test/java/org/apache/rocketmq/proxy/config/InitConfigTest", "src/test/java/org/apache/rocketmq/proxy/service/cert/TlsCertificateManagerTest", + "src/test/java/org/apache/rocketmq/proxy/remoting/protocol/http2proxy/Http2ProtocolProxyHandlerTest", ], test_files = glob(["src/test/java/**/*Test.java"]), deps = [ diff --git a/remoting/BUILD.bazel b/remoting/BUILD.bazel index 62273e5e9d0..a3b1084dc1a 100644 --- a/remoting/BUILD.bazel +++ b/remoting/BUILD.bazel @@ -26,7 +26,17 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:com_google_code_findbugs_jsr305", "@maven//:com_squareup_okio_okio_jvm", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_codec_haproxy", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", "@maven//:io_opentelemetry_opentelemetry_exporter_otlp", @@ -58,7 +68,17 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:com_google_code_findbugs_jsr305", "@maven//:com_squareup_okio_okio_jvm", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_codec_haproxy", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", "@maven//:io_opentelemetry_opentelemetry_exporter_otlp", diff --git a/srvutil/BUILD.bazel b/srvutil/BUILD.bazel index 89094098104..93c69346dcc 100644 --- a/srvutil/BUILD.bazel +++ b/srvutil/BUILD.bazel @@ -25,8 +25,17 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", - "@maven//:io_netty_netty_all", + "@maven//:at_yawk_lz4_lz4_java", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:commons_cli_commons_cli", "@maven//:com_googlecode_concurrentlinkedhashmap_concurrentlinkedhashmap_lru", "@maven//:com_google_guava_guava", @@ -44,7 +53,16 @@ java_library( "//common", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", ], ) diff --git a/store/BUILD.bazel b/store/BUILD.bazel index 8986c9b236b..98ff906d6ad 100644 --- a/store/BUILD.bazel +++ b/store/BUILD.bazel @@ -28,7 +28,16 @@ java_library( "@maven//:com_google_guava_guava", "@maven//:commons_collections_commons_collections", "@maven//:commons_io_commons_io", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:io_openmessaging_storage_dledger", "@maven//:io_opentelemetry_opentelemetry_api", "@maven//:io_opentelemetry_opentelemetry_context", diff --git a/test/BUILD.bazel b/test/BUILD.bazel index d34456f3556..c097690c80d 100644 --- a/test/BUILD.bazel +++ b/test/BUILD.bazel @@ -34,11 +34,20 @@ java_library( "@maven//:com_google_truth_truth", "@maven//:commons_cli_commons_cli", "@maven//:commons_validator_commons_validator", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:org_apache_tomcat_annotations_api", "@maven//:org_apache_commons_commons_lang3", "@maven//:org_awaitility_awaitility", - "@maven//:org_lz4_lz4_java", + "@maven//:at_yawk_lz4_lz4_java", "@maven//:org_reflections_reflections", "@maven//:org_slf4j_slf4j_api", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", @@ -75,10 +84,20 @@ java_library( "@maven//:com_google_truth_truth", "@maven//:io_grpc_grpc_api", "@maven//:io_grpc_grpc_context", + "@maven//:io_grpc_grpc_protobuf", "@maven//:io_grpc_grpc_netty_shaded", "@maven//:io_grpc_grpc_stub", "@maven//:io_grpc_grpc_testing", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:org_apache_commons_commons_lang3", "@maven//:org_apache_rocketmq_rocketmq_proto", "@maven//:io_github_aliyunmq_rocketmq_slf4j_api", diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index a809a7a92e5..d0324411606 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -28,8 +28,17 @@ java_library( "@maven//:org_apache_commons_commons_lang3", "@maven//:commons_validator_commons_validator", "@maven//:com_github_luben_zstd_jni", - "@maven//:org_lz4_lz4_java", - "@maven//:io_netty_netty_all", + "@maven//:at_yawk_lz4_lz4_java", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:commons_cli_commons_cli", "@maven//:org_slf4j_slf4j_api", "@maven//:ch_qos_logback_logback_classic", @@ -54,7 +63,16 @@ java_library( "//remoting", "//:test_deps", "@maven//:org_apache_commons_commons_lang3", - "@maven//:io_netty_netty_all", + "@maven//:io_netty_netty_buffer", + "@maven//:io_netty_netty_common", + "@maven//:io_netty_netty_handler", + "@maven//:io_netty_netty_handler_proxy", + "@maven//:io_netty_netty_transport", + "@maven//:io_netty_netty_codec", + "@maven//:io_netty_netty_codec_http", + "@maven//:io_netty_netty_codec_http2", + "@maven//:io_netty_netty_transport_native_epoll", + "@maven//:io_netty_netty_resolver", "@maven//:commons_cli_commons_cli", "@maven//:org_junit_jupiter_junit_jupiter_api", ],