Fix merge conflicts, remove unnecessary formatting changes

grpc · Mar 28, 2024 · 46eb721 · 46eb721
1 parent 52cccdb
commit 46eb721
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/netty/BUILD.bazel b/netty/BUILD.bazel
@@ -22,11 +22,11 @@ java_library(
         artifact("io.netty:netty-codec-http2"),
         artifact("io.netty:netty-codec-socks"),
         artifact("io.netty:netty-common"),
-        artifact("io.netty:netty-transport-native-unix-common"),
         artifact("io.netty:netty-handler"),
         artifact("io.netty:netty-handler-proxy"),
         artifact("io.netty:netty-resolver"),
         artifact("io.netty:netty-transport"),
+        artifact("io.netty:netty-transport-native-unix-common"),
         artifact("io.perfmark:perfmark-api"),
     ],
 )

diff --git a/rls/BUILD.bazel b/rls/BUILD.bazel
@@ -13,14 +13,13 @@ java_library(
         "//api",
         "//core",
         "//core:internal",
-        "//util",
         "//stub",
+        "//util",
         "@io_grpc_grpc_proto//:rls_config_java_proto",
         "@io_grpc_grpc_proto//:rls_java_proto",
         artifact("com.google.auto.value:auto-value-annotations"),
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("org.apache.tomcat:annotations-api"),
     ],
 )
 

diff --git a/xds/BUILD.bazel b/xds/BUILD.bazel
@@ -32,17 +32,18 @@ java_library(
         ":envoy_service_load_stats_v2_java_grpc",
         ":envoy_service_load_stats_v3_java_grpc",
         ":envoy_service_status_v3_java_grpc",
-        ":orca",
         ":xds_protos_java",
+        ":orca",
         "//:auto_value_annotations",
         "//alts",
         "//api",
         "//context",
         "//core:internal",
+        "//util",
         "//netty",
-        "//services:metrics",
         "//stub",
-        "//util",
+        "//services:metrics",
+        "//services:metrics_internal",
         "@com_google_googleapis//google/rpc:rpc_java_proto",
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:protobuf_java_util",
@@ -146,11 +147,11 @@ java_library(
         "//api",
         "//context",
         "//core:internal",
+        "//util",
         "//protobuf",
         "//services:metrics",
         "//services:metrics_internal",
         "//stub",
-        "//util",
         "@com_google_protobuf//:protobuf_java_util",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),