Merge branch 'develop' into release/MAPL-v3

# Conflicts: # CHANGELOG.md
GEOS-ESM · Feb 7, 2025 · ceb69c5 · ceb69c5
2 parents 5d8c344 + 989bf39
commit ceb69c5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -83,15 +83,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+### Fixed
+
+### Removed
+
+### Deprecated
+
+## [2.54.0] - 2025-02-07
+
+### Changed
+
 - Add column for ACG (ALIAS) that set the pointer variable to a different name than the `short_name`
 - Updated CI to use Baselibs 7.31.0
   - Updates to GFE v1.18.0
 
-### Fixed
+## [2.53.1] - 2025-01-29
 
-### Removed
+### Fixed
 
-### Deprecated
+- Fixed bug with `MAPL_GetHorzijIndex` when not points are passed on a processor causing a deadlock
 
 ## [2.53.0] - 2025-01-24
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,7 +8,7 @@ endif ()
 
 project (
   MAPL
-  VERSION 2.53.1
+  VERSION 2.54.0
   LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 # Set the possible values of build type for cmake-gui