Merge branch 'develop' into release/MAPL-v3

# Conflicts: # components.yaml
GEOS-ESM · Oct 22, 2024 · a320396 · a320396
2 parents e9fb847 + 30580d1
commit a320396
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/components.yaml b/components.yaml
@@ -5,19 +5,19 @@ GEOSldas:
 env:
   local: ./@env
   remote: ../ESMA_env.git
-  tag: v4.29.0
+  tag: v4.29.1
   develop: main
 
 cmake:
   local: ./@cmake
   remote: ../ESMA_cmake.git
-  tag: v3.50.0
+  tag: v3.52.0
   develop: develop
 
 ecbuild:
   local: ./@cmake/@ecbuild
   remote: ../ecbuild.git
-  tag: geos/v1.3.0
+  tag: geos/v1.4.0
 
 NCEP_Shared:
   local: ./src/Shared/@NCEP_Shared
@@ -29,7 +29,7 @@ NCEP_Shared:
 GMAO_Shared:
   local: ./src/Shared/@GMAO_Shared
   remote: ../GMAO_Shared.git
-  tag: v1.9.8
+  tag: v1.9.9
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
@@ -40,10 +40,16 @@ GEOS_Util:
   sparse: ./config/GEOS_Util.sparse
   develop: main
 
+# When updating the MAPL version, also update the MAPL version in the
+# CMakeLists.txt file for non-Baselibs builds
 MAPL:
   local: ./src/Shared/@MAPL
   remote: ../MAPL.git
+<<<<<<< HEAD
   branch: release/MAPL-v3
+=======
+  tag: v2.50.1
+>>>>>>> develop
   develop: develop
 
 GEOSldas_GridComp: