Merge pull request #272 from Open-MBEE/release/4.0.20

Release/4.0.20
Open-MBEE · Mar 7, 2024 · f7ac4a8 · f7ac4a8
2 parents 914daa7 + 95a9d95
commit f7ac4a8
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git 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'
     ]
 }
@@ -62,6 +62,7 @@ subprojects {
 
     group = "org.openmbee.mms"
     version = rootProject.version
+    ext['jackson-bom.version'] = jacksonVersion
 
     Map<String, String> commonDependencies = rootProject.ext.commonDependencies
 
@@ -146,10 +147,6 @@ subprojects {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
             exclude group: "log4j", module: "log4j"
         }
-
-        dependencies {
-            implementation enforcedPlatform("com.fasterxml.jackson:jackson-bom:${jacksonVersion}")
-        }
     }
 
     signing {

diff --git a/data/data.gradle b/data/data.gradle
@@ -10,4 +10,4 @@ dependencies {
     api commonDependencies.'hibernate-core'
 
     testImplementation commonDependencies.'spring-boot-starter-test'
-}
+}
diff --git 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']
diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,10 @@
-version=4.0.19
+version=4.0.20
 group=org.openmbee.mms
 
 springBootVersion=2.7.18
 springFrameworkVersion=5.3.31
 springSecurityVersion=5.7.11
 springDataVersion=2.7.18
 jacksonVersion=2.16.1
+jacksonBomVersion=2.16.1
 elasticVersion=7.8.1