diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c466dcd18061fcda52649e6bb44a5fa9800ae55..e37cab3ba7b717246c602c5df7dbe80e1d8531ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,22 +61,7 @@ include(CPM)
CPMAddPackage(
NAME units
GITHUB_REPOSITORY nholthaus/units
- VERSION 2.3.3
- PATCH_COMMAND git apply ${CMAKE_CURRENT_LIST_DIR}/patches/units/pascal-name-conflict.patch || true
- OPTIONS "DISABLE_PREDEFINED_UNITS ON"
- "ENABLE_PREDEFINED_ACCELERATION_UNITS ON"
- "ENABLE_PREDEFINED_ANGLE_UNITS ON"
- "ENABLE_PREDEFINED_ANGULAR_VELOCITY_UNITS ON"
- "ENABLE_PREDEFINED_CONCENTRATION_UNITS ON"
- "ENABLE_PREDEFINED_FORCE_UNITS ON"
- "ENABLE_PREDEFINED_LENGTH_UNITS ON"
- "ENABLE_PREDEFINED_MASS_UNITS ON"
- "ENABLE_PREDEFINED_PRESSURE_UNITS ON"
- "ENABLE_PREDEFINED_TEMPERATURE_UNITS ON"
- "ENABLE_PREDEFINED_TIME_UNITS ON"
- "ENABLE_PREDEFINED_VELOCITY_UNITS ON"
- "ENABLE_PREDEFINED_ILLUMINANCE_UNITS ON"
- "ENABLE_PREDEFINED_LUMINOUS_FLUX_UNITS ON"
+ VERSION 2.3.4
)
# Add library
diff --git a/README.md b/README.md
index e2c955b9e1440d14bc4eb0978e266e153997e990..63b0532ba944e85b880c6ba131b67b2ee9a107a5 100644
--- a/README.md
+++ b/README.md
@@ -170,7 +170,7 @@ In the following a course guideline is given, when to increment the according fi
| Name | License | Version |
|--------------------------------------------------------------------|--------------|---------|
-| [CPM](https://github.com/cpm-cmake/CPM.cmake) | MIT | 0.40.2 |
-| [Doxygen Awesome](https://github.com/jothepro/doxygen-awesome-css) | MIT | 2.3.1 |
-| [GoogleTest](https://github.com/google/googletest) | BSD-3-Clause | 1.12.1 |
-| [Units](https://github.com/nholthaus/units) | MIT | 2.3.3 |
+| [CPM](https://github.com/cpm-cmake/CPM.cmake) | MIT | 0.40.5 |
+| [Doxygen Awesome](https://github.com/jothepro/doxygen-awesome-css) | MIT | 2.3.4 |
+| [GoogleTest](https://github.com/google/googletest) | BSD-3-Clause | 1.15.2 |
+| [Units](https://github.com/nholthaus/units) | MIT | 2.3.4 |
diff --git a/WORKSPACE b/WORKSPACE
index faf98706cca77a7b11bfca857412073e4f513684..6882ab75e474152e4982f6b1be2e7d425a1491d5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,9 +3,9 @@ load("//bazel:deps.bzl", "mantle_api_deps")
http_archive(
name = "googletest",
- sha256 = "81964fe578e9bd7c94dfdb09c8e4d6e6759e19967e397dbea48d1c10e45d0df2",
- strip_prefix = "googletest-release-1.12.1",
- url = "https://github.com/google/googletest/archive/refs/tags/release-1.12.1.tar.gz",
+ sha256 = "7b42b4d6ed48810c5362c265a17faebe90dc2373c885e5216439d37927f02926",
+ strip_prefix = "googletest-1.15.2",
+ url = "https://github.com/google/googletest/archive/refs/tags/v1.15.2.tar.gz",
)
mantle_api_deps()
diff --git a/bazel/deps.bzl b/bazel/deps.bzl
index 716058dbad068e124ef8e741701610d196e65b9e..9e2c04cdf175220d46962e3776f27d9222e76d58 100644
--- a/bazel/deps.bzl
+++ b/bazel/deps.bzl
@@ -3,7 +3,7 @@ load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
ECLIPSE_GITLAB = "https://gitlab.eclipse.org/eclipse"
-UNITS_TAG = "2.3.3"
+UNITS_TAG = "2.3.4"
def mantle_api_deps():
"""Load dependencies"""
@@ -11,7 +11,7 @@ def mantle_api_deps():
http_archive,
name = "units_nhh",
url = "https://github.com/nholthaus/units/archive/refs/tags/v{tag}.tar.gz".format(tag = UNITS_TAG),
- sha256 = "b1f3c1dd11afa2710a179563845ce79f13ebf0c8c090d6aa68465b18bd8bd5fc",
+ sha256 = "e7c7d307408c30bfd30c094beea8d399907ffaf9ac4b08f4045c890f2e076049",
strip_prefix = "./units-{tag}".format(tag = UNITS_TAG),
build_file = "//bazel:units.BUILD",
)
diff --git a/cmake/CPM.cmake b/cmake/CPM.cmake
index baf2d8c344af8dcf5ef69bb7db84aa551fb74ec0..47e2e872abb89bbdda6794532d12b1a6dbe50c65 100644
--- a/cmake/CPM.cmake
+++ b/cmake/CPM.cmake
@@ -2,8 +2,8 @@
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors
-set(CPM_DOWNLOAD_VERSION 0.40.2)
-set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")
+set(CPM_DOWNLOAD_VERSION 0.40.5)
+set(CPM_HASH_SUM "c46b876ae3b9f994b4f05a4c15553e0485636862064f1fcc9d8b4f832086bc5d")
if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e529993abc8fd8ad11b25b13f041864475d789b8..5b7684a3eb20e91ffd7fc751b6cf84d62f7c2529 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -9,7 +9,7 @@
# SPDX-License-Identifier: EPL-2.0
################################################################################
-CPMAddPackage("gh:jothepro/doxygen-awesome-css@2.3.3")
+CPMAddPackage("gh:jothepro/doxygen-awesome-css@2.3.4")
find_package(Doxygen QUIET REQUIRED dot OPTIONAL_COMPONENTS mscgen dia)
diff --git a/include/MantleAPI/Common/unit_definitions.h b/include/MantleAPI/Common/unit_definitions.h
index f4cb0f7d6d8b97632400bb6333d2d11a9b06b0ae..efc274c7c8c5ee535fb7089ecac0eed35c585bc6 100644
--- a/include/MantleAPI/Common/unit_definitions.h
+++ b/include/MantleAPI/Common/unit_definitions.h
@@ -50,23 +50,6 @@ using angular_jerk_unit = base_unit<detail::meter_ratio<0>, std::ratio<0>, std::
UNIT_ADD_CATEGORY_TRAIT(angular_jerk)
-/// Adds unit 'jerk' to the given namespace, as well as a literal definition and `cout` support based on the given
-/// `abbreviation`.
-UNIT_ADD(jerk,
- meters_per_second_cubed,
- meters_per_second_cubed,
- mps_cu,
- compound_unit<velocity::meters_per_second, inverse<squared<time::seconds>>>)
-
-namespace category
-{
-
-using jerk_unit = base_unit<detail::meter_ratio<1>, std::ratio<0>, std::ratio<-3>>;
-
-} // namespace category
-
-UNIT_ADD_CATEGORY_TRAIT(jerk)
-
/// Adds new unit 'jerk_acceleration' to the given namespace, as well as a literal definition and `cout` support based on the given
/// `abbreviation`.
UNIT_ADD(jerk_acceleration,
diff --git a/patches/units/pascal-name-conflict.patch b/patches/units/pascal-name-conflict.patch
deleted file mode 100644
index 84f12ad4714d009714cf3cfbd0fa93d298fa6aa5..0000000000000000000000000000000000000000
--- a/patches/units/pascal-name-conflict.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/include/units.h b/include/units.h
-index 3a956f5..18dad0b 100644
---- a/include/units.h
-+++ b/include/units.h
-@@ -60,6 +60,11 @@
- # endif // _MSC_VER < 1800
- #endif // _MSC_VER
-
-+#if defined(__MINGW64__) || defined(__MINGW32__)
-+# pragma push_macro("pascal")
-+# undef pascal
-+#endif // __MINGW64__ or __MINGW32__
-+
- #if !defined(_MSC_VER) || _MSC_VER > 1800
- # define UNIT_HAS_LITERAL_SUPPORT
- # define UNIT_HAS_VARIADIC_TEMPLATE_SUPPORT
-@@ -4871,6 +4876,10 @@ namespace std
- # pragma pop_macro("pascal")
- #endif // _MSC_VER
-
-+#if defined(__MINGW64__) || defined(__MINGW32__)
-+# pragma pop_macro("pascal")
-+#endif // __MINGW64__ or __MINGW32__
-+
- #endif // units_h__
-
- // For Emacs
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1b25a636218c6ee14e0b8ea20774a5689280273f..263bd52d3833294186b635d385cae18ca0fd5a9f 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -11,8 +11,7 @@
CPMAddPackage(
NAME googletest
GITHUB_REPOSITORY google/googletest
- GIT_TAG release-1.12.1
- VERSION 1.12.1
+ VERSION 1.15.2
OPTIONS "INSTALL_GTEST ${MantleAPI_INSTALL_MOCKS}" "gtest_force_shared_crt ON"
)