This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/celix.git
commit 36ce8b1dc134ae8a33cfb01600967339ef58d5e5 Merge: e8336a8fd da140f541 Author: PengZheng <[email protected]> AuthorDate: Wed Mar 11 08:02:13 2026 +0800 Merge pull request #837 from apache/feature/816-drop-conan-1.x Drop Conan 1.x support and move test_package to its conventional location. .github/workflows/conan_create.yml | 4 +- conanfile.py | 2 +- examples/conan_test_package/conanfile.py | 136 --------------------- examples/conan_test_package_v2/CMakeLists.txt | 19 --- .../CMakeLists.txt | 0 .../conan_test_package => test_package}/README.md | 11 +- .../conanfile.py | 32 ++--- .../hello_bundle.c | 0 .../my_log_writer_activator.c | 0 .../my_rsa_activator.c | 0 .../test_c_rsa_spi.c | 0 .../test_celix_dfi.c | 0 .../test_cxx_shell.cpp | 0 .../test_etcd_lib.c | 0 .../test_event_admin_api.c | 0 .../test_event_admin_spi.c | 0 .../test_framework.c | 0 .../test_http_admin_activator.c | 0 .../test_log_helper.c | 0 .../test_log_service_api.c | 0 .../test_promises.cpp | 0 .../test_pushstreams.cpp | 0 .../test_rsa_spi.cc | 0 .../test_rsa_utils.cc | 0 .../test_shell.c | 0 .../test_shell_api.c | 0 .../test_utils.c | 0 27 files changed, 22 insertions(+), 182 deletions(-)
