Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ single_version_override(
],
)

bazel_dep(name = "libxml2", version = "2.15.2")
bazel_dep(name = "lz4", version = "1.9.4")
bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "protobuf", version = "33.5")
Expand Down Expand Up @@ -99,7 +100,6 @@ use_repo(non_module_dependencies, "jsoncons")
use_repo(non_module_dependencies, "krb5")
use_repo(non_module_dependencies, "libpciaccess")
use_repo(non_module_dependencies, "libprotobuf_mutator")
use_repo(non_module_dependencies, "libxml2")
use_repo(non_module_dependencies, "lksctp")
use_repo(non_module_dependencies, "openssl")
use_repo(non_module_dependencies, "openssl-fips")
Expand Down
14 changes: 4 additions & 10 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 0 additions & 8 deletions bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,6 @@ def data_dependency():
url = "https://github.com/google/libprotobuf-mutator/archive/dc4ced337a9fb4047e2dc727268fbac55ca82f73.zip",
)

http_archive(
name = "libxml2",
build_file = "//bazel/thirdparty:libxml2.BUILD",
sha256 = "2769234c4fe2fab9b0b043e891c2af0f1ae51c8d4b94799472981e676ed8009e",
strip_prefix = "libxml2-2.15.2",
url = "https://vectorized-public.s3.us-west-2.amazonaws.com/dependencies/libxml2-v2.15.2.tar.gz",
)

http_archive(
name = "lksctp",
build_file = "//bazel/thirdparty:lksctp.BUILD",
Expand Down
30 changes: 0 additions & 30 deletions bazel/thirdparty/libxml2.BUILD

This file was deleted.

2 changes: 1 addition & 1 deletion src/v/cloud_storage_clients/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ redpanda_cc_library(
"//src/v/ssx:sformat",
"//src/v/ssx:watchdog",
"//src/v/strings:string_switch",
"//src/v/thirdparty/libxml2",
"//src/v/utils:base64",
"//src/v/utils:log_hist",
"//src/v/utils:named_type",
Expand All @@ -82,6 +81,7 @@ redpanda_cc_library(
"@boost//:beast",
"@boost//:lexical_cast",
"@boost//:property_tree",
"@libxml2",
"@rapidjson",
"@seastar",
],
Expand Down
3 changes: 2 additions & 1 deletion src/v/cloud_storage_clients/xml_sax_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@
#pragma once

#include "cloud_storage_clients/client.h"
#include "thirdparty/libxml2/parser.h"

#include <seastar/core/iostream.hh>

#include <libxml/parser.h>

namespace cloud_storage_clients {

class xml_parse_exception : public std::exception {
Expand Down
2 changes: 1 addition & 1 deletion src/v/test_utils/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ redpanda_test_cc_library(
"boost_result_redirect.cc",
],
implementation_deps = [
"//src/v/thirdparty/libxml2",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:str_format",
"@abseil-cpp//absl/time",
"@boost//:config",
"@boost//:core",
"@boost//:test",
"@libxml2",
],
visibility = ["//visibility:public"],
)
Expand Down
2 changes: 1 addition & 1 deletion src/v/test_utils/boost_result_redirect.cc
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
#include "absl/strings/str_format.h"
#include "absl/strings/str_replace.h"
#include "absl/time/time.h"
#include "thirdparty/libxml2/xmlwriter.h"

#include <boost/test/results_collector.hpp>
#include <boost/test/tree/traverse.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/unit_test_suite.hpp>
#include <libxml/xmlwriter.h>

#include <stdexcept>

Expand Down
14 changes: 0 additions & 14 deletions src/v/thirdparty/libxml2/BUILD

This file was deleted.

3 changes: 0 additions & 3 deletions src/v/thirdparty/libxml2/parser.h

This file was deleted.

3 changes: 0 additions & 3 deletions src/v/thirdparty/libxml2/xmlwriter.h

This file was deleted.

Loading