DHFPROD-6304: Upgrading to Javaclient 5.3.0

Upgrading to gradle 5.6.4

adding kotlin

Author: SameeraPriyathamTadikonda

build.gradle

@@ -48,7 +48,7 @@ subprojects {
 }
 
 wrapper {
-    gradleVersion = '4.10'
+    gradleVersion = '5.6.4'
 }
 
 //Task to update versions in files they are hardcoded. If version is hardcoded in any other files in the future,it has to be added to the list

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Wed Apr 03 09:48:19 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip

gradlew

@@ -28,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

gradlew.bat

@@ -14,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m"
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

marklogic-data-hub/build.gradle

@@ -7,17 +7,20 @@ plugins {
     id 'com.moowork.node' version '1.1.1'
     id 'org.springframework.boot' version '2.1.3.RELEASE'
     id "io.spring.dependency-management" version "1.0.7.RELEASE"
-    id 'com.marklogic.ml-development-tools' version '4.2.0'
+    id 'com.marklogic.ml-development-tools' version '5.3.2'
 }
 
 mainClassName='com.marklogic.hub.ApplicationConfig'
 repositories {
+    //ToDo: Remove this once java-client-api-5.3.2 is released
+    maven {url 'http://distro.marklogic.com/nexus/repository/maven-releases/'}
     jcenter()
     maven { url 'http://repo.spring.io/milestone' }
     maven { url 'https://developer.marklogic.com/maven2/' }
 
     // Needed for marklogic-junit
     maven { url 'https://dl.bintray.com/marklogic-community/Maven/' }
+
 }
 
 group = 'com.marklogic'
@@ -32,17 +35,32 @@ ext.junitPlatformVersion = '1.4.0'
 ext.junitJupiterVersion  = '5.4.0'
 
 dependencies {
-    compile 'com.marklogic:marklogic-client-api:4.2.0'
-    compile('com.marklogic:ml-app-deployer:3.16.3'){
+    // Forcing use of 1.3.71 - which is what OkHttp 4.7.2 wants, which is what Java Client 5.3 uses - so that 1.2.x
+    // versions don't come onto the classpath
+    compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.71"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.71"
+    compile ('com.marklogic:marklogic-client-api:5.3.2'){
+        exclude group: 'com.fasterxml.woodstox', module: 'woodstox-core'
+        // Oddly, the OkHttp 4.4.0 dependency includes version 1.2.70 and 1.3.x of these dependencies. This causes
+        // class conflict errors. So they're excluded from here, and we force inclusion of 1.3.x below.
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
+        exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-common'
+    }
+    compile('com.marklogic:ml-app-deployer:4.1.0'){
         exclude group: 'org.springframework', module: 'http'
+        // prefer the version declared above
+        exclude group: 'com.marklogic', module: 'marklogic-client-api'
     }
 
     compile group: 'org.springframework.boot', name: 'spring-boot', version: '2.1.3.RELEASE'
     compile group: 'org.springframework.integration', name: 'spring-integration-http', version: '5.1.3.RELEASE'
     compile group: 'org.springframework.boot', name: 'spring-boot-autoconfigure', version: '2.1.3.RELEASE'
 
     compile 'com.marklogic:mlcp-util:0.9.0'
-    compile 'com.marklogic:marklogic-data-movement-components:1.0'
+    compile ('com.marklogic:marklogic-data-movement-components:2.2.0'){
+        // prefer the version declared above
+        exclude group: 'com.marklogic', module: 'marklogic-client-api'
+    }
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.commons:commons-text:1.1'
 
@@ -78,7 +96,10 @@ dependencies {
     }
 
     // Provides support for invoking marklogic-unit-test tests via JUnit
-    testCompile "com.marklogic:marklogic-junit:1.0.beta"
+    testCompile ("com.marklogic:marklogic-junit:1.0.beta"){
+        // prefer the version declared above
+        exclude group: 'com.marklogic', module: 'marklogic-client-api'
+    }
     mlBundle "com.marklogic:marklogic-unit-test-modules:1.0.beta"
 }
 

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/GenerateHubTDETemplateCommand.java

@@ -74,7 +74,7 @@ public void execute(CommandContext context) {
 
             if (!entityNameFileMap.isEmpty()) {
                 logger.warn("About to generate a template for the following entities: {} into directory {} ",
-                    this.entityNamesList.isEmpty() ? entityNameFileMap.keySet() : this.entityNamesList, hubConfig.getAppConfig().getSchemasPath());
+                    this.entityNamesList.isEmpty() ? entityNameFileMap.keySet() : this.entityNamesList, hubConfig.getAppConfig().getSchemaPaths());
                 List<GeneratedCode> generatedCodes = new ArrayList<>();
                 for (File f : entityNameFileMap.values()) {
                     File esModel;

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/HubConfigImpl.java

@@ -1940,7 +1940,9 @@ private void updateAppConfig(AppConfig config) {
 
         initializeModulePaths(config);
 
-        config.setSchemasPath(getUserSchemasDir().toString());
+        List<String> schemaPaths = new ArrayList<>();
+        schemaPaths.add(getUserSchemasDir().toString());
+        config.setSchemaPaths(schemaPaths);
 
         addDhfPropertiesToCustomTokens(config);
 

ml-data-hub-plugin/build.gradle

@@ -49,17 +49,22 @@ repositories {
     mavenCentral()
     maven { url 'http://repo.spring.io/milestone' }
     maven { url 'http://developer.marklogic.com/maven2' }
+    //ToDo: Remove this once java-client-api-5.3.2 is released
+    maven {url 'http://distro.marklogic.com/nexus/repository/maven-releases/'}
 }
 
 dependencies {
     compile gradleApi()
     compile (project(':marklogic-data-hub')) {
         exclude group: 'ch.qos.logback'
+        exclude group: "com.squareup.okhttp3", module: "okhttp"
+        exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
     }
     compile ('com.marklogic:ml-gradle:3.16.3') {
         exclude group: 'ch.qos.logback'
     }
-
+    compile "com.squareup.okhttp3:okhttp:4.4.0"
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     testCompile localGroovy()
     testCompile gradleTestKit()
     testCompile 'xmlunit:xmlunit:1.3'

web/build.gradle

@@ -46,6 +46,8 @@ bootWar {
 repositories {
     jcenter()
     maven {url 'http://developer.marklogic.com/maven2/'}
+    //ToDo: Remove this once java-client-api-5.3.2 is released
+    maven {url 'http://distro.marklogic.com/nexus/repository/maven-releases/'}
 }
 
 sourceCompatibility = 1.8
@@ -69,7 +71,14 @@ dependencies {
 
     compile("org.aspectj:aspectjweaver:1.8.9")
     compile("org.springframework:spring-messaging")
-    compile project(":marklogic-data-hub")
+    compile "org.jetbrains.kotlin:kotlin-stdlib:1.3.61"
+    compile "org.jetbrains.kotlin:kotlin-stdlib-common:1.3.61"
+    compile(project(":marklogic-data-hub")){
+      exclude group: "com.squareup.okhttp3", module: "okhttp"
+      exclude group: "com.squareup.okhttp3", module: "logging-interceptor"
+    }
+    compile "com.squareup.okhttp3:okhttp:4.4.0"
+    compile "com.squareup.okhttp3:logging-interceptor:4.4.0"
     compile("org.apache.commons:commons-csv:1.4")
 
     // Optional Boot library - see https://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-devtools.html