This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-deprecated-version in repository https://gitbox.apache.org/repos/asf/celix.git
commit 65f53a131d89411975163cda30671d518a947761 Merge: 63fa8b1a 72592753 Author: Pepijn Noltes <[email protected]> AuthorDate: Thu Jan 4 15:50:54 2024 +0100 Merge branch 'master' into feature/509-remove-deprecated-version # Conflicts: # libs/framework/include_deprecated/module.h # libs/utils/include_deprecated/celix_utils_api.h .github/workflows/coverage.yml | 2 +- .github/workflows/coverity-scan.yml | 1 - .github/workflows/macos.yml | 4 +- .github/workflows/ubuntu.yml | 3 +- CHANGES.md | 3 + bundles/http_admin/http_admin/src/http_admin.c | 17 +- .../include/endpoint_descriptor_reader.h | 4 +- .../include/endpoint_descriptor_writer.h | 4 +- .../include/endpoint_discovery_poller.h | 3 +- .../src/endpoint_descriptor_reader.c | 33 +- .../src/endpoint_descriptor_writer.c | 6 +- .../src/endpoint_discovery_poller.c | 251 ++++--- .../src/endpoint_discovery_server.c | 23 +- .../gtest/src/rsa_tests.cc | 8 +- .../src/remote_service_admin_dfi.c | 34 +- .../src/remote_service_admin_dfi.h | 6 +- .../rsa_shm/src/rsa_shm_impl.c | 8 +- .../rsa_shm/src/rsa_shm_impl.h | 5 +- .../rsa_common/src/import_registration_impl.c | 5 +- .../rsa_common/src/import_registration_impl.h | 2 +- .../rsa_common/src/remote_interceptors_handler.c | 31 +- .../rsa_common/src/remote_service_admin_impl.h | 6 +- .../rsa_spi/include/endpoint_description.h | 2 +- .../rsa_spi/include/endpoint_listener.h | 3 - .../rsa_spi/include/remote_service_admin.h | 6 +- .../remote_services/topology_manager/src/scope.c | 60 +- .../topology_manager/src/topology_manager.c | 12 +- .../topology_manager/src/topology_manager.h | 4 +- .../tms_tst/disc_mock/disc_mock_activator.c | 10 +- .../tms_tst/disc_mock/disc_mock_service.c | 4 +- .../tms_tst/disc_mock/disc_mock_service.h | 4 +- .../topology_manager/tms_tst/tms_tests.cpp | 30 +- bundles/shell/remote_shell/src/remote_shell.c | 55 +- bundles/shell/remote_shell/src/remote_shell.h | 2 +- bundles/shell/shell_tui/gtest/CMakeLists.txt | 1 + .../shell/shell_tui/gtest/src/ShellTuiTestSuite.cc | 36 +- bundles/shell/shell_tui/src/activator.c | 2 +- bundles/shell/shell_tui/src/history.c | 111 +-- bundles/shell/shell_tui/src/history.h | 26 +- bundles/shell/shell_tui/src/shell_tui.c | 41 +- bundles/shell/shell_tui/src/shell_tui.h | 6 +- cmake/Modules/FindCppUTest.cmake | 69 -- conanfile.py | 3 - examples/conan_test_package/my_rsa_activator.c | 6 +- .../src/CelixBundleContextServicesTestSuite.cc | 6 +- libs/framework/include/celix_api.h | 8 +- libs/framework/include_deprecated/bundle.h | 2 - libs/framework/include_deprecated/bundle_context.h | 1 - .../framework/include_deprecated/bundle_revision.h | 2 +- libs/framework/include_deprecated/dm_component.h | 2 +- .../include_deprecated/dm_dependency_manager.h | 1 - libs/framework/include_deprecated/module.h | 10 - .../include_deprecated/service_reference.h | 1 - .../include_deprecated/service_registration.h | 1 - .../include_deprecated/service_registry.h | 2 +- .../framework/include_deprecated/service_tracker.h | 1 - libs/framework/src/bundle.c | 66 +- libs/framework/src/bundle_archive.c | 1 - libs/framework/src/bundle_context.c | 16 +- libs/framework/src/bundle_context_private.h | 2 +- libs/framework/src/bundle_private.h | 2 +- libs/framework/src/dm_component_impl.c | 10 +- libs/framework/src/dm_dependency_manager_impl.c | 9 +- libs/framework/src/framework.c | 110 ++- libs/framework/src/framework_private.h | 14 +- libs/framework/src/manifest_parser.h | 1 - libs/framework/src/module.c | 22 +- libs/framework/src/registry_callback_private.h | 2 +- libs/framework/src/service_reference.c | 2 +- libs/framework/src/service_registry.c | 226 +++--- libs/framework/src/service_tracker.c | 26 +- libs/utils/CMakeLists.txt | 40 -- libs/utils/benchmark/src/StringHashmapBenchmark.cc | 2 +- libs/utils/gtest/CMakeLists.txt | 16 +- .../src/DeprecatedHashmapTestSuite.cc} | 789 ++++++++++---------- .../gtest/src/IpUtilsErrorInjectionTestSuite.cc | 47 -- libs/utils/include_deprecated/array_list.h | 97 --- libs/utils/include_deprecated/celix_utils_api.h | 2 +- libs/utils/include_deprecated/ip_utils.h | 52 -- libs/utils/include_deprecated/linked_list.h | 92 --- .../include_deprecated/linked_list_iterator.h | 66 -- libs/utils/private/test/array_list_test.cpp | 584 --------------- libs/utils/private/test/ip_utils_test.cpp | 108 --- libs/utils/private/test/linked_list_test.cpp | 796 --------------------- libs/utils/src/array_list.c | 337 +-------- libs/utils/src/array_list_private.h | 14 - libs/utils/src/hash_map.c | 1 - libs/utils/src/hash_map_private.h | 7 + libs/utils/src/ip_utils.c | 170 ----- libs/utils/src/linked_list.c | 269 ------- libs/utils/src/linked_list_iterator.c | 154 ---- libs/utils/src/linked_list_private.h | 44 -- 92 files changed, 1122 insertions(+), 4063 deletions(-) diff --cc libs/framework/include_deprecated/module.h index b0185bf2,0aeabb64..4cef2d97 --- a/libs/framework/include_deprecated/module.h +++ b/libs/framework/include_deprecated/module.h @@@ -32,9 -32,8 +32,7 @@@ typedef struct module celix_module_t #include <stdbool.h> - #include "linked_list.h" #include "manifest.h" - #include "array_list.h" -#include "version.h" #include "bundle.h" #include "celix_framework_export.h" diff --cc libs/framework/src/manifest_parser.h index 0557285a,a4136633..0f995406 --- a/libs/framework/src/manifest_parser.h +++ b/libs/framework/src/manifest_parser.h @@@ -28,9 -28,8 +28,8 @@@ #define MANIFEST_PARSER_H_ #include "module.h" -#include "version.h" +#include "celix_version.h" #include "manifest.h" - #include "linked_list.h" typedef struct manifestParser * manifest_parser_pt;
