DHFPROD-7046:Updating the versions to 5.4-SNAPSHOT for 5.4.1

Yakov Feldman · yakov-feldman · commit 6ada9201349f · 2021-03-10T14:41:39.000-08:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -629,7 +629,7 @@ pipeline{
 		stage('code-review'){
 		when {
   			 allOf {
-    changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''
+    changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''
   }
   			beforeAgent true
 		}
@@ -709,7 +709,7 @@ pipeline{
 		}
 		stage('Merge-PR'){
 		when {
-  			changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''
+  			changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''
   			beforeAgent true
 		}
 		agent {label 'dhmaster'};
diff --git a/examples/dh-5-example/build.gradle b/examples/dh-5-example/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
@@ -27,7 +27,7 @@ repositories {
 
 dependencies {
     if (project.hasProperty("testing")) {
-        compile "com.marklogic:marklogic-data-hub:5.4.0"
+        compile "com.marklogic:marklogic-data-hub:5.4-SNAPSHOT"
     } else {
         compile "com.marklogic:marklogic-data-hub:5.2.0"
     }
diff --git a/examples/dhf5-custom-hook/build.gradle b/examples/dhf5-custom-hook/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "net.saliman:gradle-properties-plugin:1.5.1"
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
diff --git a/examples/insurance/build.gradle b/examples/insurance/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "net.saliman:gradle-properties-plugin:1.5.1"
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
diff --git a/examples/mapping-example/build.gradle b/examples/mapping-example/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "net.saliman:gradle-properties-plugin:1.5.1"
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
diff --git a/examples/patient-hub/build.gradle b/examples/patient-hub/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "net.saliman:gradle-properties-plugin:1.5.1"
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
diff --git a/examples/smart-mastering-complete/build.gradle b/examples/smart-mastering-complete/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath "net.saliman:gradle-properties-plugin:1.5.1"
         if (project.hasProperty("testing")) {
-            classpath "com.marklogic:ml-data-hub:5.4.0"
+            classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
         } else {
             classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"
         }
diff --git a/examples/snapshot-testing/build.gradle b/examples/snapshot-testing/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
     dependencies {
       classpath "net.saliman:gradle-properties-plugin:1.5.1"
-        classpath "com.marklogic:ml-data-hub:5.4.0"
+        classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=5.4.0
+version=5.4-SNAPSHOT
 publishUrl=file:../marklogic-data-hub/releases
 systemProp.file.encoding=utf-8
 # disabling TLSv3 as a workaround for the bug in openJDK 11(https://bugs.openjdk.java.net/browse/JDK-8213202)
diff --git a/marklogic-data-hub-central/gradle.properties b/marklogic-data-hub-central/gradle.properties
@@ -2,7 +2,7 @@ reactUiPath=./ui
 springBootUiPath=src/main/resources/static
 springBootJarName=marklogic-data-hub-central
 
-# For 5.4.0, Spring Boot 2.3.x is being used to ensure that it uses Jackson 2.11, which is the same version that 
+# For 5.4-SNAPSHOT, Spring Boot 2.3.x is being used to ensure that it uses Jackson 2.11, which is the same version that 
 # the ML Java Client wants to use. Spring Security 5.3.8 is then used to ensure it and Spring Boot are using the same
 # underlying Spring libraries, which is version 5.2.12. 
 springBootVersion=2.3.8.RELEASE
diff --git a/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java b/marklogic-data-hub/src/main/java/com/marklogic/hub/impl/VersionInfo.java
@@ -57,6 +57,6 @@ public static String getBuildVersion() {
         }
 
         String version = properties.getProperty("version");
-        return "${project.version}".equals(version) ? "5.4.0" : version;
+        return "${project.version}".equals(version) ? "5.4-SNAPSHOT" : version;
     }
 }
diff --git a/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json b/marklogic-data-hub/src/main/resources/hub-internal-config/security/roles/data-hub-admin.json
@@ -1,6 +1,6 @@
 {
   "role-name": "data-hub-admin",
-  "description": "5.4.0: Permits developing and operating a Data Hub application, along with clearing databases",
+  "description": "5.4-SNAPSHOT: Permits developing and operating a Data Hub application, along with clearing databases",
   "role": [
     "data-hub-developer"
   ],
diff --git a/marklogic-data-hub/src/main/resources/scaffolding/build_gradle b/marklogic-data-hub/src/main/resources/scaffolding/build_gradle
@@ -8,5 +8,5 @@ plugins {
     // Applies the Data Hub Gradle plugin, which extends ml-gradle with behavior specific to Data Hub.
     // For more information on this plugin, see https://docs.marklogic.com/datahub/tools/gradle/dhf-gradle-plugin.html .
     // For more information on ml-gradle, see https://github.com/marklogic-community/ml-gradle .
-    id 'com.marklogic.ml-data-hub' version '5.4.0'
+    id 'com.marklogic.ml-data-hub' version '5.4-SNAPSHOT'
 }
diff --git a/pipeline.properties b/pipeline.properties
@@ -1,2 +1,2 @@
 ReleaseBranch:release/5.4.0
-ExecutionBranch:develop
+ExecutionBranch:feature/5.4-develop

Original file line number	Diff line number	Diff line change
`@@ -629,7 +629,7 @@ pipeline{`
`629`	`629`	`stage('code-review'){`
`630`	`630`	`when {`
`631`	`631`	`allOf {`
`632`		`- changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''`
	`632`	`+ changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''`
`633`	`633`	`}`
`634`	`634`	`beforeAgent true`
`635`	`635`	`}`
`@@ -709,7 +709,7 @@ pipeline{`
`709`	`709`	`}`
`710`	`710`	`stage('Merge-PR'){`
`711`	`711`	`when {`
`712`		`- changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'develop', title: '', url: ''`
	`712`	`+ changeRequest author: '', authorDisplayName: '', authorEmail: '', branch: '', fork: '', id: '', target: 'feature/5.4-develop', title: '', url: ''`
`713`	`713`	`beforeAgent true`
`714`	`714`	`}`
`715`	`715`	`agent {label 'dhmaster'};`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`	`8`	`if (project.hasProperty("testing")) {`
`9`		`- classpath "com.marklogic:ml-data-hub:5.4.0"`
	`9`	`+ classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"`
`10`	`10`	`} else {`
`11`	`11`	`classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"`
`12`	`12`	`}`
`@@ -27,7 +27,7 @@ repositories {`
`27`	`27`
`28`	`28`	`dependencies {`
`29`	`29`	`if (project.hasProperty("testing")) {`
`30`		`- compile "com.marklogic:marklogic-data-hub:5.4.0"`
	`30`	`+ compile "com.marklogic:marklogic-data-hub:5.4-SNAPSHOT"`
`31`	`31`	`} else {`
`32`	`32`	`compile "com.marklogic:marklogic-data-hub:5.2.0"`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ buildscript {`
`8`	`8`	`dependencies {`
`9`	`9`	`classpath "net.saliman:gradle-properties-plugin:1.5.1"`
`10`	`10`	`if (project.hasProperty("testing")) {`
`11`		`- classpath "com.marklogic:ml-data-hub:5.4.0"`
	`11`	`+ classpath "com.marklogic:ml-data-hub:5.4-SNAPSHOT"`
`12`	`12`	`} else {`
`13`	`13`	`classpath "gradle.plugin.com.marklogic:ml-data-hub:5.2.0"`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version=5.4.0`
	`1`	`+version=5.4-SNAPSHOT`
`2`	`2`	`publishUrl=file:../marklogic-data-hub/releases`
`3`	`3`	`systemProp.file.encoding=utf-8`
`4`	`4`	`# disabling TLSv3 as a workaround for the bug in openJDK 11(https://bugs.openjdk.java.net/browse/JDK-8213202)`