From eef572535c016f3cc5dc990ec72c3857c2600fdd Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 6 Mar 2024 15:53:54 -0800
Subject: [PATCH 1/3] Update versions for release

---
 docs/conf.py      | 4 ++--
 gradle.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 24beaec43..877a104e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -26,7 +26,7 @@
 master_doc = 'index'
 
 # The full version, including alpha/beta/rc tags
-release = '4.0.19'
+release = '4.0.20'
 
 
 # -- General configuration ---------------------------------------------------
@@ -57,4 +57,4 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ['_static']
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 7763f812f..c01e8f3db 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=4.0.19
+version=4.0.20
 group=org.openmbee.mms
 
 springBootVersion=2.7.18

From cb5b9aac9307617ff18d89a790d26e1ec2e4dee4 Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 6 Mar 2024 16:35:46 -0800
Subject: [PATCH 2/3] Don't use enforced platform. Also add the jackson-bom
 version to spring dependency management.

---
 build.gradle     | 3 ++-
 data/data.gradle | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 6acae354a..da556a270 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,6 +62,7 @@ subprojects {
 
     group = "org.openmbee.mms"
     version = rootProject.version
+    ext['jackson-bom.version'] = jacksonVersion
 
     Map<String, String> commonDependencies = rootProject.ext.commonDependencies
 
@@ -148,7 +149,7 @@ subprojects {
         }
 
         dependencies {
-            implementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
+            api platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
         }
     }
 
diff --git a/data/data.gradle b/data/data.gradle
index a4b4c31c0..ee1f7eaa4 100644
--- a/data/data.gradle
+++ b/data/data.gradle
@@ -10,4 +10,4 @@ dependencies {
     api commonDependencies.'hibernate-core'
 
     testImplementation commonDependencies.'spring-boot-starter-test'
-}
+}
\ No newline at end of file

From 95a9d95e11970ea5e3a4c0df2ed40078fcecf74e Mon Sep 17 00:00:00 2001
From: Jason Han <jason.han@jpl.nasa.gov>
Date: Wed, 6 Mar 2024 17:17:22 -0800
Subject: [PATCH 3/3] Don't use the BOM and Spring Dependency Management
 together.

---
 build.gradle      | 12 ++++--------
 gradle.properties |  1 +
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index da556a270..5df7cf391 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,10 +29,10 @@ ext {
         'spring-aspects'                : "org.springframework:spring-aspects:$springFrameworkVersion",
         'spring-data-commons'           : "org.springframework.data:spring-data-commons:$springDataVersion",
         'spring-data-jpa'               : "org.springframework.data:spring-data-jpa:$springDataVersion",
-        'jackson-annotations'           : "com.fasterxml.jackson.core:jackson-annotations",
-        'jackson-databind'              : "com.fasterxml.jackson.core:jackson-databind",
-        'jackson-datatype-hibernate5'   : "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5",
-        'jackson-datatype-jsr310'       : "com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
+        'jackson-annotations'           : "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion",
+        'jackson-databind'              : "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion",
+        'jackson-datatype-hibernate5'   : "com.fasterxml.jackson.datatype:jackson-datatype-hibernate5:$jacksonVersion",
+        'jackson-datatype-jsr310'       : "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion",
         'spring-boot-starter-test'      : 'org.springframework.boot:spring-boot-starter-test:2.2.4.RELEASE'
     ]
 }
@@ -147,10 +147,6 @@ subprojects {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
             exclude group: "log4j", module: "log4j"
         }
-
-        dependencies {
-            api platform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
-        }
     }
 
     signing {
diff --git a/gradle.properties b/gradle.properties
index c01e8f3db..64311ee4c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,4 +6,5 @@ springFrameworkVersion=5.3.31
 springSecurityVersion=5.7.11
 springDataVersion=2.7.18
 jacksonVersion=2.16.1
+jacksonBomVersion=2.16.1
 elasticVersion=7.8.1
\ No newline at end of file