From 862893f93e1d529017e81d6c741f1a4bcd1d956b Mon Sep 17 00:00:00 2001 From: "J. Daniel Smith" Date: Mon, 5 Jun 2023 14:05:53 -0400 Subject: [PATCH] SIX-3.2.3 (#655) * SIX 3.1.15 * merge develop/sync_externals * Update ReleaseNotes.md for SIX 3.2.3 --- ReleaseNotes.md | 10 +++++++--- six/modules/c++/six/include/six/Version.h | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 9f6e7205e..64c5f815b 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,10 +2,14 @@ # SIX [Release](https://github.com/ngageoint/six-library/releases) Notes -## [Version 3.2.?](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.?); ??? ??, 2023 -* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-??-??](https://github.com/mdaus/coda-oss/releases/tag/2023-??-??) -* [nitro](https://github.com/mdaus/nitro) version [2.11.?](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.?) +## [Version 3.2.3](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.3); June 5, 2023 +* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05) +* [nitro](https://github.com/mdaus/nitro) version [2.11.3](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.3) * Integrated [ISM v201609](https://www.dni.gov/index.php/who-we-are/organizations/ic-cio/ic-cio-related-menus/ic-cio-related-links/ic-technical-specifications/information-security-marking-metadata) into SIDD 3.0. +* Retain "legacy" support for ISM-v13 with SIDD 3.0. +* Tweak `DataWriter` implementation in preperation for future changes. +* CPHD wasn't parsing all optional fields correctly. +* Adjust compiler flags for clean *CMake* builds. ## [Version 3.2.2](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.2); December 14, 2022 * [coda-oss](https://github.com/mdaus/coda-oss) version [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14) diff --git a/six/modules/c++/six/include/six/Version.h b/six/modules/c++/six/include/six/Version.h index d5f1ca508..6818b2e7c 100644 --- a/six/modules/c++/six/include/six/Version.h +++ b/six/modules/c++/six/include/six/Version.h @@ -36,10 +36,11 @@ // SIX 3.2.0 2022-Aug-30 (C++14) // SIX 3.2.1 2022-Nov-04 // SIX 3.2.2 2022-Dec-14 +// SIX 3.2.3 2023-Jun-05 #define SIX_VERSION_MAJOR 3 #define SIX_VERSION_MINOR 2 -#define SIX_VERSION_PATCH 2 +#define SIX_VERSION_PATCH 3 //#define SIX_VERSION_BUILD 0 //#define SIX_VERSION CODA_OSS_MAKE_VERSION_MMPB(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH, SIX_VERSION_BUILD) #define SIX_VERSION CODA_OSS_MAKE_VERSION_MMP(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH)