From 6bb62379e727efdf8589d2f179ad2f20a6330d44 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Wed, 5 Apr 2023 14:09:26 -0400 Subject: [PATCH] Bump UCO to current state of develop This patch is solely about Git submodule logistics, and carries no semantic impact on CASE. This patch is necessary for some "downstream" submodule synchronization. The CASE `develop-2.0.0`, `unstable`, and `unstable-2.0.0` branches should share a history point where the UCO submodule state is at its post-release `develop` status. Otherwise, catch-up merges of CASE's `develop` into other CASE branches will encounter Git merge conflicts pertaining to the submodule. This is a consequence of the plan laid out in UCO Issue 493, which was somewhat expected. However, recent trial practices in guaranteeing submodules are up to date (e.g. `case-prov` PR 63 and CASE-Corpora PR 54) have brought the issue to light, given the CASE `unstable` branch is currently behind the release rather than ahead of it, and needs `develop` updated to avoid the submodule-based merge conflicts. References: * https://github.com/casework/CASE-Corpora/pull/54 * https://github.com/casework/CASE-Implementation-PROV-O/pull/63 * https://github.com/ucoProject/UCO/issues/493 Signed-off-by: Alex Nelson --- dependencies/UCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/UCO b/dependencies/UCO index 5bb9243..83d46bd 160000 --- a/dependencies/UCO +++ b/dependencies/UCO @@ -1 +1 @@ -Subproject commit 5bb9243e62a9978fcf0e9f6e9e5ce19d6a254135 +Subproject commit 83d46bd2e57c01aadfb4f19388ac23f58f5ee89b