Merge branch 'release/1.0.0-beta.6'

Author: paxtonhare

.gitignore

@@ -2,7 +2,9 @@
 .gradle/
 .settings/
 .metadata/
+.idea/
 marklogic-data-hub/bin/
+marklogic-data-hub/src/main/resources/ml-modules/root/trace-ui
 quick-start/bin/
 build/
 releases/

examples/gradle-advanced/build.gradle

@@ -10,7 +10,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-data-hub-plugin' version '1.0.0-beta.5'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'
     id 'com.marklogic.ml-gradle' version '2.1.0'
 }
 

examples/gradle-basic/build.gradle

@@ -10,7 +10,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.5'
-    id 'com.marklogic.ml-data-hub-plugin' version '1.0.0-beta.5'
+    id 'com.marklogic.ml-data-hub' version '1.0.0-beta.6'
     id 'com.marklogic.ml-gradle' version '2.1.0'
 }
 

marklogic-data-hub/build.gradle

@@ -5,7 +5,7 @@ plugins {
     id 'idea'
     id 'maven-publish'
     id 'com.jfrog.bintray' version '1.6'
-    id 'com.marklogic.ml-gradle' version '2.1.0'
+    id 'com.marklogic.ml-gradle' version '2.2.0'
 }
 
 repositories {
@@ -21,13 +21,10 @@ targetCompatibility = 1.8
 
 dependencies {
     compile 'org.springframework.batch:spring-batch-core:3.0.6.RELEASE'
-    compile 'com.marklogic:marklogic-xcc:8.0.5'
     compile 'com.marklogic:java-client-api:3.0.4'
-    compile 'com.marklogic:ml-javaclient-util:2.6.1'
-    compile 'com.marklogic:ml-app-deployer:2.0'
+    compile 'com.marklogic:ml-javaclient-util:2.9.0'
+    compile 'com.marklogic:ml-app-deployer:2.2.0'
     compile 'commons-io:commons-io:2.4'
-    compile 'org.apache.commons:commons-csv:1.2'
-    compile 'org.glassfish.jaxb:txw2:2.2.11'
     testCompile 'org.springframework.batch:spring-batch-test:3.0.6.RELEASE'
     testCompile 'junit:junit:4.12'
     testCompile 'xmlunit:xmlunit:1.3'
@@ -44,6 +41,25 @@ task sourcesJar(type: Jar, dependsOn: classes) {
     from sourceSets.main.allSource
 }
 
+task npmInstallTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'install'
+}
+
+task buildTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'run', 'build'
+    dependsOn tasks.npmInstallTraceUI
+}
+
+task watchTraceUI(type:Exec) {
+    workingDir './src/trace-ui'
+    commandLine 'npm', 'start'
+    dependsOn tasks.npmInstallTraceUI
+}
+
+build.dependsOn buildTraceUI
+
 javadoc {
    options.overview = 'src/main/resources/overview.html'
 }

marklogic-data-hub/gradle.properties

@@ -28,6 +28,6 @@ mlSchemasDbName=data-hub-SCHEMAS
 
 hubModulesPath=exmaples/hr-hub/plugins
 
-version=1.0.0-beta.5
+version=1.0.0-beta.6