This is an automated email from the ASF dual-hosted git repository. pnoltes pushed a commit to branch feature/509-remove-osgi-defines in repository https://gitbox.apache.org/repos/asf/celix.git
commit c732ff203d8188f0446a20bc157d61ac49f1ae7a Merge: 8ff445a3 5cdd18db Author: Pepijn Noltes <[email protected]> AuthorDate: Sun Oct 29 13:40:57 2023 +0100 Merge branch 'master' into feature/509-remove-osgi-defines # Conflicts: # CHANGES.md CHANGES.md | 3 + .../publisher/private/src/ps_pub_activator.c | 1 - .../private/src/ps_websocket_activator.c | 1 - .../pubsub/pubsub_admin_tcp/src/psa_activator.c | 1 - .../src/pubsub_tcp_topic_receiver.c | 1 - .../src/pubsub_websocket_topic_receiver.c | 1 - .../pubsub/pubsub_admin_zmq/src/psa_activator.c | 1 - .../src/pubsub_zmq_topic_receiver.c | 1 - .../pubsub_spi/src/pubsub_interceptors_handler.c | 1 - .../pubsub_topology_manager/src/pstm_activator.c | 2 - bundles/pubsub/pubsub_utils/src/pubsub_matching.c | 1 - .../gtest/src/rsa_client_server_tests.cc | 2 - .../gtest/src/rsa_tests.cc | 3 - .../gtest/src/tst_activator.c | 2 - .../src/export_registration_dfi.c | 1 - .../rsa_shm/src/rsa_shm_export_registration.c | 1 - .../rsa_common/src/remote_interceptors_handler.c | 1 - bundles/shell/shell/src/c_shell_activator.c | 1 - cmake/celix_project/ApacheRat.cmake | 2 +- cmake/cmake_celix/BundlePackaging.cmake | 60 --- cmake/cmake_celix/DockerPackaging.cmake | 597 --------------------- cmake/cmake_celix/Runtimes.cmake | 253 --------- cmake/cmake_celix/UseCelix.cmake | 3 - cmake/cmake_celix/create_target_filesystem.sh | 215 -------- cmake/cmake_celix/runtime_common.sh.in | 230 -------- cmake/cmake_celix/runtime_start.sh.in | 31 -- cmake/cmake_celix/runtime_stop.sh.in | 34 -- .../gtest/src/DependencyManagerTestSuite.cc | 5 - libs/framework/include/celix/UseServiceBuilder.h | 1 - .../framework/include/celix/dm/ServiceDependency.h | 16 - .../include/celix/dm/ServiceDependency_Impl.h | 15 - libs/framework/include/celix_bundle_context.h | 34 +- libs/framework/include/celix_constants.h | 8 - .../include/celix_dm_service_dependency.h | 6 - .../include_deprecated/dm_service_dependency.h | 6 - .../include_deprecated/service_registry.h | 2 - libs/framework/src/dm_component_impl.c | 1 - libs/framework/src/dm_service_dependency.c | 55 +- libs/framework/src/dm_service_dependency_impl.h | 31 +- 39 files changed, 41 insertions(+), 1589 deletions(-) diff --cc CHANGES.md index 0b31972b,31bdfdfa..8bdae1a7 --- a/CHANGES.md +++ b/CHANGES.md @@@ -33,10 -33,9 +33,13 @@@ limitations under the License - pubsub_serializer.h is removed and no longer supported. Use pubsub_message_serialization_service.h instead. - C++11 support for dm is removed. C++14 is now the minimum required version. - C++17 string_view support is removed from the utils and framework lib. + - Apache Celix CMake bundle functions without a celix_ prefix or infix are removed. + - Apache Celix CMake support for creating docker images and creating runtimes dirs is removed. -- Support and usage of "service.lang" service property is removed. ++- Support and usage of "service.lang" service property is removed. +- Rename of `CELIX_FRAMEWORK_FRAMEWORK_CACHE_DIR` config property to `CELIX_FRAMEWORK_CACHE_DIR`. +- Support for OSGI_FRAMEWORK_* config properties are dropped. Use CELIX_FRAMEWORK_* instead. + Note this includes the `OSGI_FRAMEWORK_FRAMEWORK_STORAGE` ("org.osgi.framework.storage") config property, + which has been replaced with the `CELIX_FRAMEWORK_CACHE_DIR` config property. # Noteworthy Changes for 2.4.0 (2023-09-27) diff --cc libs/framework/include/celix_constants.h index c6895c63,8f09b4d8..75d38171 --- a/libs/framework/include/celix_constants.h +++ b/libs/framework/include/celix_constants.h @@@ -112,15 -118,8 +112,7 @@@ extern "C" */ #define CELIX_FRAMEWORK_SERVICE_VERSION "service.version" - /** - * The service language property and values are deprecated - */ - #define CELIX_FRAMEWORK_SERVICE_LANGUAGE "service.lang" - #define CELIX_FRAMEWORK_SERVICE_C_LANGUAGE "C" - #define CELIX_FRAMEWORK_SERVICE_CXX_LANGUAGE "C++" - #define CELIX_FRAMEWORK_SERVICE_SHARED_LANGUAGE "shared" //e.g. marker services - #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR "Bundle-Activator" -#define OSGI_FRAMEWORK_BUNDLE_ACTIVATOR CELIX_FRAMEWORK_BUNDLE_ACTIVATOR #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_CREATE "celix_bundleActivator_create" #define CELIX_FRAMEWORK_BUNDLE_ACTIVATOR_START "celix_bundleActivator_start"
