Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SIX-3.2.3 #655

Merged
merged 5 commits into from
Jun 5, 2023
Merged

SIX-3.2.3 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1cb2f0
SIX 3.1.15
Mar 13, 2023
4e2b904
Merge branch 'main' into feature/version
Jun 5, 2023
a903eef
merge develop/sync_externals
Jun 5, 2023
ed2ee3b
Update ReleaseNotes.md for SIX 3.2.3
Jun 5, 2023
7be6c0f
Merge branch 'main' into feature/version
Jun 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion six/modules/c++/six/include/six/Version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down