From 3356da650f04b60190642be3efece47afa66b61a Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 27 Jan 2020 14:51:23 -0500 Subject: [PATCH] Update version and README --- README.md | 5 +++++ fsw/cfe-core/src/inc/cfe_version.h | 35 ++++++++++++------------------ 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 436503d5e..c1f12d808 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,11 @@ This is a collection of services and associated framework to be located in the ` ## Version Notes +- 6.7.6: DEVELOPMENT + - Adds OMIT_DEPRECATED prep flag + - Adds and enforces strict warnings + - Software Bus now increments sequence counter even if there are no subscribers + - Warning, comment, and code coverage cleanup (see https://github.com/nasa/cFE/pull/490) - 6.7.5: DEVELOPMENT - Added CI static analysis check - Resolved static analysis warnings diff --git a/fsw/cfe-core/src/inc/cfe_version.h b/fsw/cfe-core/src/inc/cfe_version.h index 29eb735fb..95fe8f3a0 100644 --- a/fsw/cfe-core/src/inc/cfe_version.h +++ b/fsw/cfe-core/src/inc/cfe_version.h @@ -30,28 +30,21 @@ ** the Major number, the Minor number, the Implementation Revision number, and the Mission Revision number. At ** their option, Missions may modify the Mission Revision information as needed to suit their needs. ** -** The Major number shall be incremented to indicate when there is a change to an API. Specifically when the API -** changes in ways that will cause existing correctly-written cFS components to stop working. It may also be -** incremented for a release that contains changes deemed to be of similar impact, even if there are no actual -** changes to the API. The Major number may increment when there is no breaking change to the API, if the changes -** are significant enough to warrant the same level of attention as a breaking API change. The Major number is -** provided as a simple macro defined in this header file as part of the API definition; this macro must expand -** to a simple integer value, so that it can be used in simple #if directives by the macro preprocessor. +** The Major number shall be incremented on release to indicate when there is a change to an API +** that may cause existing correctly-written cFS components to stop working. It may also be incremented for a +** release that contains changes deemed to be of similar impact, even if there are no actual changes to the API. ** -** The Minor number shall be incremented to indicate the addition of features to the API, which do not break -** existing code. It may also be incremented for a release that contains changes deemed to be of similar impact, -** even if there are no actual updates to the API. The Minor number may increment when there have been no -** augmentations to the API, if changes are as significant as additions to the public API. The Minor number is -** provided as a simple macro defined in this header file as part of the API definition; this macro must expand -** to a simple integer value, so that it can be used in simple #if directives by the macro preprocessor. +** The Minor number shall be incremented on release to indicate the addition of features to the API, +** which do not break the existin code. It may also be incremented for a release that contains changes deemed +** to be of similar impact, even if there are no actual updates to the API. ** -** The Implementation Revision Version number shall be incremented when updates are made to an implementation that -** do not have consequences visible to external components. It may also be updated if there are other changes -** contained within a release that make it desirable for applications to distinguish one release from another. The -** Revision number may update in implementations where no actual implementation-specific code has changed, if -** there are other changes within the release with similar significance. The Revision number is provided as a -** simple macro defined in this header file as part of the API definition; this macro must expand to a simple -** integer value, so that it can be used in simple #if directives by the macro preprocessor. +** The Implementation Revision Version number shall be incremented on changes to software in the master branch, +** or other changes that benefit from unique identification. It is used for identifying open source development +** versions. +** +** The Major, Minor, and Implementation Revision numbers are provided in this header file as part of the API +** definition; this macro must expand to a simple integer value, so that it can be used in simple #if directives +** by the macro preprocessor. ** ** The Mission Version number shall be set to zero in all officially released packages, and is entirely reserved ** for the use of the mission. The Mission Version is provided as a simple macro defined in the cfe_platform_cfg.h @@ -81,7 +74,7 @@ */ #define CFE_MAJOR_VERSION 6 #define CFE_MINOR_VERSION 7 -#define CFE_REVISION 5 +#define CFE_REVISION 6 #endif /* _cfe_version_ */