Skip to content

Commit 976c663

Browse files
author
James Williams
authored
Add transitive dependency on netty-handler to the connection package (#399)
## What is the goal of this PR? In line with bumping our netty dependencies (typedb/typedb-dependencies#415), we need to include a transitive dependency that has been introduced on netty's side between the version we used to depend on and the version we now depend on. ## What are the changes implemented in this PR? Add `@maven//:io_netty_netty_handler` to our dependencies for the connection module. ## Additional info We should merge the linked dependencies PR and bump the commit of dependencies we are depending on before merging this PR.
1 parent ca1aa6f commit 976c663

File tree

4 files changed

+41
-94
lines changed

4 files changed

+41
-94
lines changed

WORKSPACE

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ java_deps()
3939
# Load //builder/kotlin
4040
load("@vaticle_dependencies//builder/kotlin:deps.bzl", kotlin_deps = "deps")
4141
kotlin_deps()
42-
load("@io_bazel_rules_kotlin//kotlin:kotlin.bzl", "kotlin_repositories", "kt_register_toolchains")
42+
load("@io_bazel_rules_kotlin//kotlin:repositories.bzl", "kotlin_repositories")
4343
kotlin_repositories()
44+
load("@io_bazel_rules_kotlin//kotlin:core.bzl", "kt_register_toolchains")
4445
kt_register_toolchains()
4546

4647
# Load //builder/python

connection/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ java_library(
4646
"@maven//:io_grpc_grpc_netty",
4747
"@maven//:io_grpc_grpc_stub",
4848
"@maven//:io_netty_netty_all",
49+
"@maven//:io_netty_netty_handler",
4950
"@maven//:org_slf4j_slf4j_api",
5051
],
5152
runtime_deps = [

dependencies/maven/artifacts.snapshot

Lines changed: 37 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,158 +1,103 @@
1-
@maven//:ch_qos_logback_logback_classic
21
@maven//:ch_qos_logback_logback_classic_1_2_7
3-
@maven//:ch_qos_logback_logback_core
42
@maven//:ch_qos_logback_logback_core_1_2_7
5-
@maven//:com_eclipsesource_minimal_json_minimal_json
63
@maven//:com_eclipsesource_minimal_json_minimal_json_0_9_5
7-
@maven//:com_electronwill_night_config_core
84
@maven//:com_electronwill_night_config_core_3_6_5
9-
@maven//:com_electronwill_night_config_toml
105
@maven//:com_electronwill_night_config_toml_3_6_5
11-
@maven//:com_google_android_annotations
126
@maven//:com_google_android_annotations_4_1_1_4
13-
@maven//:com_google_api_grpc_proto_google_common_protos
147
@maven//:com_google_api_grpc_proto_google_common_protos_2_0_1
15-
@maven//:com_google_code_findbugs_annotations
168
@maven//:com_google_code_findbugs_annotations_3_0_1
17-
@maven//:com_google_code_findbugs_jsr305
189
@maven//:com_google_code_findbugs_jsr305_2_0_2
19-
@maven//:com_google_code_gson_gson
2010
@maven//:com_google_code_gson_gson_2_8_6
21-
@maven//:com_google_errorprone_error_prone_annotations
2211
@maven//:com_google_errorprone_error_prone_annotations_2_9_0
23-
@maven//:com_google_guava_failureaccess
2412
@maven//:com_google_guava_failureaccess_1_0_1
25-
@maven//:com_google_guava_guava
2613
@maven//:com_google_guava_guava_30_1_jre
27-
@maven//:com_google_guava_listenablefuture
2814
@maven//:com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava
29-
@maven//:com_google_http_client_google_http_client
3015
@maven//:com_google_http_client_google_http_client_1_34_2
31-
@maven//:com_google_j2objc_j2objc_annotations
3216
@maven//:com_google_j2objc_j2objc_annotations_1_3
33-
@maven//:com_google_protobuf_protobuf_java
3417
@maven//:com_google_protobuf_protobuf_java_3_14_0
35-
@maven//:commons_codec_commons_codec
3618
@maven//:commons_codec_commons_codec_1_11
37-
@maven//:commons_io_commons_io
3819
@maven//:commons_io_commons_io_2_3
39-
@maven//:commons_logging_commons_logging
4020
@maven//:commons_logging_commons_logging_1_2
41-
@maven//:info_picocli_picocli
4221
@maven//:info_picocli_picocli_4_6_1
43-
@maven//:io_cucumber_cucumber_core
4422
@maven//:io_cucumber_cucumber_core_5_1_3
45-
@maven//:io_cucumber_cucumber_expressions
4623
@maven//:io_cucumber_cucumber_expressions_8_3_1
47-
@maven//:io_cucumber_cucumber_gherkin
4824
@maven//:io_cucumber_cucumber_gherkin_5_1_3
49-
@maven//:io_cucumber_cucumber_gherkin_vintage
5025
@maven//:io_cucumber_cucumber_gherkin_vintage_5_1_3
51-
@maven//:io_cucumber_cucumber_java
5226
@maven//:io_cucumber_cucumber_java_5_1_3
53-
@maven//:io_cucumber_cucumber_junit
5427
@maven//:io_cucumber_cucumber_junit_5_1_3
55-
@maven//:io_cucumber_cucumber_plugin
5628
@maven//:io_cucumber_cucumber_plugin_5_1_3
57-
@maven//:io_cucumber_datatable
5829
@maven//:io_cucumber_datatable_3_2_1
59-
@maven//:io_cucumber_docstring
6030
@maven//:io_cucumber_docstring_5_1_3
61-
@maven//:io_cucumber_tag_expressions
6231
@maven//:io_cucumber_tag_expressions_2_0_4
63-
@maven//:io_grpc_grpc_api
6432
@maven//:io_grpc_grpc_api_1_43_0
65-
@maven//:io_grpc_grpc_context
6633
@maven//:io_grpc_grpc_context_1_43_0
67-
@maven//:io_grpc_grpc_core
6834
@maven//:io_grpc_grpc_core_1_43_0
69-
@maven//:io_grpc_grpc_netty
7035
@maven//:io_grpc_grpc_netty_1_43_0
71-
@maven//:io_grpc_grpc_protobuf
7236
@maven//:io_grpc_grpc_protobuf_1_43_0
73-
@maven//:io_grpc_grpc_protobuf_lite
7437
@maven//:io_grpc_grpc_protobuf_lite_1_43_0
75-
@maven//:io_grpc_grpc_stub
7638
@maven//:io_grpc_grpc_stub_1_43_0
77-
@maven//:io_grpc_grpc_testing
7839
@maven//:io_grpc_grpc_testing_1_43_0
79-
@maven//:io_netty_netty_all
80-
@maven//:io_netty_netty_all_4_1_63_Final
81-
@maven//:io_netty_netty_buffer
82-
@maven//:io_netty_netty_buffer_4_1_63_Final
83-
@maven//:io_netty_netty_codec
84-
@maven//:io_netty_netty_codec_4_1_63_Final
85-
@maven//:io_netty_netty_codec_http
86-
@maven//:io_netty_netty_codec_http2
87-
@maven//:io_netty_netty_codec_http2_4_1_63_Final
88-
@maven//:io_netty_netty_codec_http_4_1_63_Final
89-
@maven//:io_netty_netty_codec_socks
90-
@maven//:io_netty_netty_codec_socks_4_1_63_Final
91-
@maven//:io_netty_netty_common
92-
@maven//:io_netty_netty_common_4_1_63_Final
93-
@maven//:io_netty_netty_handler
94-
@maven//:io_netty_netty_handler_4_1_63_Final
95-
@maven//:io_netty_netty_handler_proxy
96-
@maven//:io_netty_netty_handler_proxy_4_1_63_Final
97-
@maven//:io_netty_netty_resolver
98-
@maven//:io_netty_netty_resolver_4_1_63_Final
99-
@maven//:io_netty_netty_tcnative_boringssl_static
100-
@maven//:io_netty_netty_tcnative_boringssl_static_2_0_46_Final
101-
@maven//:io_netty_netty_tcnative_classes
102-
@maven//:io_netty_netty_tcnative_classes_2_0_46_Final
103-
@maven//:io_netty_netty_transport
104-
@maven//:io_netty_netty_transport_4_1_63_Final
105-
@maven//:io_opencensus_opencensus_api
40+
@maven//:io_netty_netty_all_4_1_87_Final
41+
@maven//:io_netty_netty_buffer_4_1_87_Final
42+
@maven//:io_netty_netty_codec_4_1_87_Final
43+
@maven//:io_netty_netty_codec_dns_4_1_87_Final
44+
@maven//:io_netty_netty_codec_haproxy_4_1_87_Final
45+
@maven//:io_netty_netty_codec_http2_4_1_87_Final
46+
@maven//:io_netty_netty_codec_http_4_1_87_Final
47+
@maven//:io_netty_netty_codec_memcache_4_1_87_Final
48+
@maven//:io_netty_netty_codec_mqtt_4_1_87_Final
49+
@maven//:io_netty_netty_codec_redis_4_1_87_Final
50+
@maven//:io_netty_netty_codec_smtp_4_1_87_Final
51+
@maven//:io_netty_netty_codec_socks_4_1_87_Final
52+
@maven//:io_netty_netty_codec_stomp_4_1_87_Final
53+
@maven//:io_netty_netty_codec_xml_4_1_87_Final
54+
@maven//:io_netty_netty_common_4_1_87_Final
55+
@maven//:io_netty_netty_handler_4_1_87_Final
56+
@maven//:io_netty_netty_handler_proxy_4_1_87_Final
57+
@maven//:io_netty_netty_handler_ssl_ocsp_4_1_87_Final
58+
@maven//:io_netty_netty_resolver_4_1_87_Final
59+
@maven//:io_netty_netty_resolver_dns_4_1_87_Final
60+
@maven//:io_netty_netty_resolver_dns_classes_macos_4_1_87_Final
61+
@maven//:io_netty_netty_resolver_dns_native_macos_osx_aarch_64_4_1_87_Final
62+
@maven//:io_netty_netty_resolver_dns_native_macos_osx_x86_64_4_1_87_Final
63+
@maven//:io_netty_netty_tcnative_boringssl_static_2_0_49_Final
64+
@maven//:io_netty_netty_tcnative_classes_2_0_49_Final
65+
@maven//:io_netty_netty_transport_4_1_87_Final
66+
@maven//:io_netty_netty_transport_classes_epoll_4_1_87_Final
67+
@maven//:io_netty_netty_transport_classes_kqueue_4_1_87_Final
68+
@maven//:io_netty_netty_transport_native_epoll_linux_aarch_64_4_1_87_Final
69+
@maven//:io_netty_netty_transport_native_epoll_linux_x86_64_4_1_87_Final
70+
@maven//:io_netty_netty_transport_native_kqueue_osx_aarch_64_4_1_87_Final
71+
@maven//:io_netty_netty_transport_native_kqueue_osx_x86_64_4_1_87_Final
72+
@maven//:io_netty_netty_transport_native_unix_common_4_1_87_Final
73+
@maven//:io_netty_netty_transport_rxtx_4_1_87_Final
74+
@maven//:io_netty_netty_transport_sctp_4_1_87_Final
75+
@maven//:io_netty_netty_transport_udt_4_1_87_Final
10676
@maven//:io_opencensus_opencensus_api_0_28_0
107-
@maven//:io_opencensus_opencensus_contrib_http_util
10877
@maven//:io_opencensus_opencensus_contrib_http_util_0_24_0
109-
@maven//:io_perfmark_perfmark_api
11078
@maven//:io_perfmark_perfmark_api_0_23_0
111-
@maven//:javax_annotation_javax_annotation_api
11279
@maven//:javax_annotation_javax_annotation_api_1_3_2
113-
@maven//:junit_junit
11480
@maven//:junit_junit_4_12
115-
@maven//:net_bytebuddy_byte_buddy
11681
@maven//:net_bytebuddy_byte_buddy_1_6_4
117-
@maven//:net_bytebuddy_byte_buddy_agent
11882
@maven//:net_bytebuddy_byte_buddy_agent_1_6_4
119-
@maven//:net_jcip_jcip_annotations
12083
@maven//:net_jcip_jcip_annotations_1_0
121-
@maven//:org_antlr_antlr4_runtime
12284
@maven//:org_antlr_antlr4_runtime_4_8
123-
@maven//:org_apache_commons_commons_compress
12485
@maven//:org_apache_commons_commons_compress_1_21
125-
@maven//:org_apache_httpcomponents_httpclient
12686
@maven//:org_apache_httpcomponents_httpclient_4_5_11
127-
@maven//:org_apache_httpcomponents_httpcore
12887
@maven//:org_apache_httpcomponents_httpcore_4_4_13
129-
@maven//:org_apiguardian_apiguardian_api
13088
@maven//:org_apiguardian_apiguardian_api_1_1_0
131-
@maven//:org_checkerframework_checker_qual
13289
@maven//:org_checkerframework_checker_qual_3_5_0
133-
@maven//:org_codehaus_mojo_animal_sniffer_annotations
13490
@maven//:org_codehaus_mojo_animal_sniffer_annotations_1_19
135-
@maven//:org_hamcrest_hamcrest
13691
@maven//:org_hamcrest_hamcrest_2_2
137-
@maven//:org_hamcrest_hamcrest_all
13892
@maven//:org_hamcrest_hamcrest_all_1_3
139-
@maven//:org_hamcrest_hamcrest_core
14093
@maven//:org_hamcrest_hamcrest_core_1_3
141-
@maven//:org_hamcrest_hamcrest_library
14294
@maven//:org_hamcrest_hamcrest_library_1_3
143-
@maven//:org_mockito_mockito_core
95+
@maven//:org_jetbrains_compose_compiler_compiler_1_3_2
14496
@maven//:org_mockito_mockito_core_2_6_4
145-
@maven//:org_objenesis_objenesis
14697
@maven//:org_objenesis_objenesis_2_5
147-
@maven//:org_slf4j_jcl_over_slf4j
14898
@maven//:org_slf4j_jcl_over_slf4j_1_7_32
149-
@maven//:org_slf4j_log4j_over_slf4j
15099
@maven//:org_slf4j_log4j_over_slf4j_1_7_32
151-
@maven//:org_slf4j_slf4j_api
152100
@maven//:org_slf4j_slf4j_api_1_7_32
153-
@maven//:org_slf4j_slf4j_simple
154101
@maven//:org_slf4j_slf4j_simple_1_7_32
155-
@maven//:org_yaml_snakeyaml
156102
@maven//:org_yaml_snakeyaml_1_25
157-
@maven//:org_zeroturnaround_zt_exec
158103
@maven//:org_zeroturnaround_zt_exec_1_10

dependencies/vaticle/repositories.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def vaticle_dependencies():
3939
git_repository(
4040
name = "vaticle_dependencies",
4141
remote = "https://github.com/vaticle/dependencies",
42-
commit = "4464b506ca469f37d3b696fb2f1eda34061cdaa1", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
42+
commit = "1ceb8f8eb78312a0fd0d34cf6f91ca52d90ce1ad", # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_dependencies
4343
)
4444

4545
def vaticle_typedb_protocol():

0 commit comments

Comments
 (0)