Skip to content

Release 1.3.0 - #148

Merged
plbt5 merged 19 commits into
masterfrom
release-1.3.0
Jan 24, 2024
Merged

Release 1.3.0#148
plbt5 merged 19 commits into
masterfrom
release-1.3.0

Conversation

@ajnelson-nist

@ajnelson-nist ajnelson-nist commented Jan 24, 2024

Copy link
Copy Markdown
Member

Coordination

  • Pull Request is against correct branch
  • Pull Request is in Draft status before CI has passed
  • CI passes
  • Milestone linked

plbt5 and others added 19 commits March 29, 2023 21:05
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:
* casework/CASE-Corpora#54
* casework/CASE-Implementation-PROV-O#63
* ucoProject/UCO#493

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#536

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
UCO Issue 536: Bump UCO to current state of develop
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#541

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
UCO Issue 541: Bump UCO to current state of develop
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#563

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
UCO Issue 563: Bump UCO to current state of develop
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#571

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
UCO Issue 571: Bump UCO to current state of develop #141
No effects were observed on Make-managed files.

References:
* ucoProject/UCO#579

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
This ports the patch from UCO PR 579.

References:
* ucoProject/UCO#579

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
A follow-on patch will regenerate Make-managed files.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>
@ajnelson-nist ajnelson-nist added this to the CASE 1.3.0 milestone Jan 24, 2024
@ajnelson-nist ajnelson-nist mentioned this pull request Jan 24, 2024
6 tasks
@ajnelson-nist
ajnelson-nist marked this pull request as ready for review January 24, 2024 16:14
@ajnelson-nist

Copy link
Copy Markdown
Member Author

This PR is ready for review and merge.

@ajnelson-nist
ajnelson-nist requested a review from a team January 24, 2024 16:20
@plbt5
plbt5 merged commit fa84ffb into master Jan 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants