This is an automated email from the ASF dual-hosted git repository.
pengzheng pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/celix.git
from e8336a8fd Remove filter.h and replace usage with celix_filter.h
add da140f541 Drop Conan 1.x support and move test_package to its
conventional location.
new 36ce8b1dc Merge pull request #837 from
apache/feature/816-drop-conan-1.x
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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(-)
delete mode 100644 examples/conan_test_package/conanfile.py
delete mode 100644 examples/conan_test_package_v2/CMakeLists.txt
rename {examples/conan_test_package => test_package}/CMakeLists.txt (100%)
rename {examples/conan_test_package => test_package}/README.md (81%)
rename {examples/conan_test_package_v2 => test_package}/conanfile.py (86%)
rename {examples/conan_test_package => test_package}/hello_bundle.c (100%)
rename {examples/conan_test_package => test_package}/my_log_writer_activator.c
(100%)
rename {examples/conan_test_package => test_package}/my_rsa_activator.c (100%)
rename {examples/conan_test_package => test_package}/test_c_rsa_spi.c (100%)
rename {examples/conan_test_package => test_package}/test_celix_dfi.c (100%)
rename {examples/conan_test_package => test_package}/test_cxx_shell.cpp (100%)
rename {examples/conan_test_package => test_package}/test_etcd_lib.c (100%)
rename {examples/conan_test_package => test_package}/test_event_admin_api.c
(100%)
rename {examples/conan_test_package => test_package}/test_event_admin_spi.c
(100%)
rename {examples/conan_test_package => test_package}/test_framework.c (100%)
rename {examples/conan_test_package =>
test_package}/test_http_admin_activator.c (100%)
rename {examples/conan_test_package => test_package}/test_log_helper.c (100%)
rename {examples/conan_test_package => test_package}/test_log_service_api.c
(100%)
rename {examples/conan_test_package => test_package}/test_promises.cpp (100%)
rename {examples/conan_test_package => test_package}/test_pushstreams.cpp
(100%)
rename {examples/conan_test_package => test_package}/test_rsa_spi.cc (100%)
rename {examples/conan_test_package => test_package}/test_rsa_utils.cc (100%)
rename {examples/conan_test_package => test_package}/test_shell.c (100%)
rename {examples/conan_test_package => test_package}/test_shell_api.c (100%)
rename {examples/conan_test_package => test_package}/test_utils.c (100%)
