Merge pull request #1621 from marklogic/release/6.4.0

Merge release/6.4.0 into master
marklogic · Nov 14, 2023 · 045acdc · 045acdc
2 parents 7c73f9d + bf0ff0c
commit 045acdc
Show file tree

Hide file tree

Showing 64 changed files with 2,148 additions and 12,675 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,3 +35,5 @@ xml-with-props.xml
 
 ml-development-tools/src/test/ml-modules
 ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/generated
+
+.vscode
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -21,7 +21,7 @@ def runAllTests(String type, String version, Boolean useReverseProxy){
                 export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
                 export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
                 cd java-client-api
-                ./gradlew -i mlDeploy -PmlForestDataDirectory=/space
+                ./gradlew -i mlDeploy mlReloadSchemas -PmlForestDataDirectory=/space
             '''
 
             if (useReverseProxy) {
@@ -152,16 +152,16 @@ pipeline{
         }
       }
       steps {
-        copyRPM 'Latest','11'
+        copyRPM 'Release','11.1.0'
         setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
-        copyConvertersRPM 'Latest','11'
+        copyConvertersRPM 'Release','11.1.0'
         setUpMLConverters '$WORKSPACE/xdmp/src/Mark*Converters*.rpm'
         sh label:'deploy test app', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
           export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
           export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
           cd java-client-api
-          ./gradlew -i mlDeploy -PmlForestDataDirectory=/space
+          ./gradlew -i mlDeploy mlReloadSchemas -PmlForestDataDirectory=/space
         '''
         sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
           export JAVA_HOME=$JAVA_HOME_DIR
@@ -192,41 +192,41 @@ pipeline{
         '''
       }
     }
-    stage('regressions-11-Latest') {
+    stage('regressions-11-Release') {
       when {
         allOf {
           branch 'develop'
           expression {return params.regressions}
         }
       }
       steps {
-        runAllTests('Latest', '11', false)
+        runAllTests('Release', '11.1.0', false)
         junit '**/build/**/TEST*.xml'
       }
     }
 
-    stage('regressions-11-Latest-reverseProxy') {
+    stage('regressions-11-Release-reverseProxy') {
     	when {
 				allOf {
 					branch 'develop'
 					expression {return params.regressions}
 				}
 			}
 			steps {
-				runAllTests('Latest', '11', true)
+				runAllTests('Release', '11.1.0', true)
 				junit '**/build/**/TEST*.xml'
 			}
     }
 
-    stage('regressions-10.0-9') {
+    stage('regressions-10.0-10.2') {
       when {
         allOf {
           branch 'develop'
           expression {return params.regressions}
         }
       }
       steps {
-        runAllTests('Release', '10.0-9.5', false)
+        runAllTests('Release', '10.0-10.2', false)
         junit '**/build/**/TEST*.xml'
       }
     }