Skip to content

Commit f17155b

Browse files
keithkeith
committed
Reduce bazel patch
1 parent e416b7e commit f17155b

1 file changed

Lines changed: 6 additions & 125 deletions

File tree

‎third_party/bazel/bazel.patch‎

Lines changed: 6 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,9 @@
11
diff --git a/third_party/BUILD b/third_party/BUILD
2-
index 262577182a..1bf4666b53 100644
2+
index 262577182a..6300c8f25a 100644
33
--- a/third_party/BUILD
44
+++ b/third_party/BUILD
5-
@@ -252,4 +252,4 @@ distrib_jar_filegroup(
6-
srcs = [
7-
- "@maven//:com_google_auto_value_auto_value_annotations_file",
8-
- "@maven//:com_google_auto_value_auto_value_file",
9-
+ "@maven//:com_google_auto_value_auto_value",
10-
+ "@maven//:com_google_auto_value_auto_value_annotations",
11-
],
12-
@@ -307,4 +307,4 @@ distrib_jar_filegroup(
13-
srcs = [
14-
- "@maven//:com_google_errorprone_error_prone_annotations_file",
15-
- "@maven//:org_threeten_threeten_extra_file",
16-
+ "@maven//:com_google_errorprone_error_prone_annotations",
17-
+ "@maven//:org_threeten_threeten_extra",
18-
],
19-
@@ -331,3 +331,3 @@ distrib_jar_filegroup(
20-
srcs = [
21-
- "@maven//:com_github_stephenc_jcip_jcip_annotations_file",
22-
+ "@maven//:com_github_stephenc_jcip_jcip_annotations",
23-
],
24-
@@ -354,9 +354,5 @@ filegroup(
5+
@@ -353,15 +353,13 @@ filegroup(
6+
# TODO(https://github.com/bazelbuild/bazel/issues/18214): After fixing Guava leak
257
# in test-runner, the guava target can be reverted back to java_library
268
-java_import(
279
+java_library(
@@ -32,111 +14,10 @@ index 262577182a..1bf4666b53 100644
3214
- "@maven//:com_google_guava_failureaccess_file",
3315
- ],
3416
exports = [
35-
@@ -365,2 +361,4 @@ java_import(
17+
":error_prone_annotations",
18+
":jcip_annotations",
3619
":jsr305",
3720
+ "@maven//:com_google_guava_failureaccess",
3821
+ "@maven//:com_google_guava_guava",
3922
],
40-
@@ -398,5 +396,5 @@ distrib_jar_filegroup(
41-
srcs = [
42-
- "@maven//:com_google_flogger_flogger_file",
43-
- "@maven//:com_google_flogger_flogger_system_backend_file",
44-
- "@maven//:com_google_flogger_google_extensions_file",
45-
+ "@maven//:com_google_flogger_flogger",
46-
+ "@maven//:com_google_flogger_flogger_system_backend",
47-
+ "@maven//:com_google_flogger_google_extensions",
48-
],
49-
@@ -408,3 +406,3 @@ distrib_jar_filegroup(
50-
name = "guava-jars",
51-
- srcs = ["@maven//:com_google_guava_guava_file"],
52-
+ srcs = ["@maven//:com_google_guava_guava"],
53-
enable_distributions = ["debian"],
54-
@@ -415,3 +413,3 @@ distrib_jar_filegroup(
55-
name = "guava-failureaccess-jar",
56-
- srcs = ["@maven//:com_google_guava_failureaccess_file"],
57-
+ srcs = ["@maven//:com_google_guava_failureaccess"],
58-
enable_distributions = ["debian"],
59-
@@ -445,3 +443,3 @@ distrib_jar_filegroup(
60-
name = "jsr305-jars",
61-
- srcs = ["@maven//:com_google_code_findbugs_jsr305_file"],
62-
+ srcs = ["@maven//:com_google_code_findbugs_jsr305"],
63-
enable_distributions = ["debian"],
64-
@@ -477,7 +475,7 @@ genrule(
65-
srcs = select({
66-
- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64_file"],
67-
- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64_file"],
68-
- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64_file"],
69-
- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64_file"],
70-
- "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64_file"],
71-
+ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_aarch_64"],
72-
+ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_osx_x86_64"],
73-
+ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_aarch_64"],
74-
+ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_tcnative_boringssl_static_linux_x86_64"],
75-
+ "//src/conditions:windows": ["@maven//:io_netty_netty_tcnative_boringssl_static_windows_x86_64"],
76-
"//conditions:default": [],
77-
@@ -495,27 +493,27 @@ distrib_java_import(
78-
jars = [
79-
- "@maven//:io_netty_netty_buffer_file",
80-
- "@maven//:io_netty_netty_codec_file",
81-
- "@maven//:io_netty_netty_codec_http2_file",
82-
- "@maven//:io_netty_netty_codec_http_file",
83-
- "@maven//:io_netty_netty_common_file",
84-
- "@maven//:io_netty_netty_handler_file",
85-
- "@maven//:io_netty_netty_handler_proxy_file",
86-
- "@maven//:io_netty_netty_resolver_file",
87-
- "@maven//:io_netty_netty_resolver_dns_file",
88-
- "@maven//:io_netty_netty_transport_file",
89-
- "@maven//:io_netty_netty_transport_classes_epoll_file",
90-
- "@maven//:io_netty_netty_transport_classes_kqueue_file",
91-
+ "@maven//:io_netty_netty_buffer",
92-
+ "@maven//:io_netty_netty_codec",
93-
+ "@maven//:io_netty_netty_codec_http2",
94-
+ "@maven//:io_netty_netty_codec_http",
95-
+ "@maven//:io_netty_netty_common",
96-
+ "@maven//:io_netty_netty_handler",
97-
+ "@maven//:io_netty_netty_handler_proxy",
98-
+ "@maven//:io_netty_netty_resolver",
99-
+ "@maven//:io_netty_netty_resolver_dns",
100-
+ "@maven//:io_netty_netty_transport",
101-
+ "@maven//:io_netty_netty_transport_classes_epoll",
102-
+ "@maven//:io_netty_netty_transport_classes_kqueue",
103-
] + select({
104-
- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64_file"],
105-
- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64_file"],
106-
- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64_file"],
107-
- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64_file"],
108-
- "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common_file"],
109-
+ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_aarch_64"],
110-
+ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_osx_x86_64"],
111-
+ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_aarch_64"],
112-
+ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_unix_common_linux_x86_64"],
113-
+ "//conditions:default": ["@maven//:io_netty_netty_transport_native_unix_common"],
114-
}) + select({
115-
- "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64_file"],
116-
- "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64_file"],
117-
+ "//src/conditions:darwin_arm64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64"],
118-
+ "//src/conditions:darwin_x86_64": ["@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64"],
119-
"//conditions:default": [],
120-
}) + select({
121-
- "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64_file"],
122-
- "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64_file"],
123-
+ "//src/conditions:linux_aarch64": ["@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64"],
124-
+ "//src/conditions:linux_x86_64": ["@maven//:io_netty_netty_transport_native_epoll_linux_x86_64"],
125-
"//conditions:default": [],
126-
@@ -528,3 +526,3 @@ distrib_java_import(
127-
jars = [
128-
- "@maven//:io_netty_netty_tcnative_classes_file",
129-
+ "@maven//:io_netty_netty_tcnative_classes",
130-
] + select({
131-
@@ -547,3 +545,3 @@ distrib_jar_filegroup(
132-
name = "tomcat_annotations_api-jars",
133-
- srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api_file"],
134-
+ srcs = ["@maven//:org_apache_tomcat_tomcat_annotations_api"],
135-
enable_distributions = ["debian"],
136-
@@ -620,4 +618,4 @@ filegroup(
137-
srcs = [
138-
- "@maven//:junit_junit_file",
139-
- "@maven//:org_hamcrest_hamcrest_core_file",
140-
+ "@maven//:junit_junit",
141-
+ "@maven//:org_hamcrest_hamcrest_core",
142-
],
23+
)

0 commit comments

Comments
 (0)