Merge pull request #662 from apache/feature/509-remove-static-dm-libs

#509: Remove static dm libs (dm is integral part of framework)

CHANGES.md

@@ -21,7 +21,12 @@ limitations under the License.
 
 # Noteworthy Changes for 3.0.0 (TBD)
 
+## Backwards incompatible changes
+
 - Deployment Admin bundle has been removed and is no longer supported.
+- The libs `dependency_manager_static`, `shell_dm` and `dependency_manager_cxx_static` are removed. These libraries are
+  not needed anymore. The dependency manager is an integral part of the framework lib and the `dm` command is part 
+  of the standard shell commands.
 
 # Noteworthy Changes for 2.4.0 (2023-09-27)
 

conanfile.py

@@ -91,8 +91,6 @@ class CelixConan(ConanFile):
         "build_pushstreams": False,
         "build_experimental": False,
         "build_celix_dfi": False,
-        "build_dependency_manager": False,
-        "build_dependency_manager_cxx": False,
         "build_framework": False,
         "build_rcm": False,
         "build_utils": False,
@@ -315,13 +313,9 @@ def configure(self):
         if options["build_rcm"]:
             options["build_utils"] = True
 
-        if options["build_launcher"] or options["build_dependency_manager"]:
+        if options["build_launcher"]:
             options["build_framework"] = True
 
-        if options["build_dependency_manager_cxx"]:
-            options["build_framework"] = True
-            options["celix_cxx14"] = True
-
         if options["build_celix_dfi"]:
             options["build_utils"] = True
 

libs/CMakeLists.txt

@@ -29,14 +29,7 @@ add_subdirectory(framework)
 #launcher
 add_subdirectory(launcher)
 
-#add_subdirectory(event_admin)# event_admin is unstable
-add_subdirectory(dependency_manager)
-if (CELIX_CXX14)
-    add_subdirectory(dependency_manager_cxx)
-endif ()
-
 # Error Injectors
 if (ENABLE_TESTING AND EI_TESTS)
     add_subdirectory(error_injector)
 endif ()
-