Merge branch 'release/2.0.0-alpha.2' into 2.0-master

Author: paxtonhare

.travis.yml

@@ -1,11 +1,21 @@
 language: java
 jdk:
   - oraclejdk8
+env:
+ - NODE_VERSION=6.1
 sudo: true
 before_install:
   - echo 'America/Los_Angeles' | sudo tee /etc/timezone
   - sudo dpkg-reconfigure --frontend noninteractive tzdata
 install:
+  - nvm install $NODE_VERSION
+  - nvm use $NODE_VERSION
+  - npm install -g typings
   - ./shared/dev-tasks/install-dependencies.sh
 script:
-  - '[ "${TRAVIS_SECURE_ENV_VARS}" = "false" ] && ./gradlew test || ./gradlew jshint'
+  - nvm use $NODE_VERSION
+  - if [[ $TRAVIS_SECURE_ENV_VARS == true ]]; then
+      ./gradlew check;
+    else
+      ./gradlew jshint;
+    fi

CHANGELOG.md

@@ -1,8 +1,49 @@
 # Change Log
 
-## [v2.0.1-alpha.1](https://github.com/marklogic/marklogic-data-hub/tree/v2.0.1-alpha.1)
+## [Unreleased](https://github.com/marklogic/marklogic-data-hub/tree/v2.0.0-alpha.2)
 
-[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.2...v2.0.1-alpha.1)
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.0...v2.0.0-alpha.2)
+
+**Implemented enhancements:**
+
+- Allow exernal data to be passed in to a flow's options-map [\#334](https://github.com/marklogic/marklogic-data-hub/issues/334)
+- Integrate with Entity Services [\#283](https://github.com/marklogic/marklogic-data-hub/issues/283)
+- show traces for a given flow [\#277](https://github.com/marklogic/marklogic-data-hub/issues/277)
+
+**Fixed bugs:**
+
+- Returning json:object\(\) isn't invoking ES serialization in flow [\#345](https://github.com/marklogic/marklogic-data-hub/issues/345)
+
+**Closed issues:**
+
+- "No message available" when following Quick Start [\#352](https://github.com/marklogic/marklogic-data-hub/issues/352)
+- Add job-id to harmonized documents [\#351](https://github.com/marklogic/marklogic-data-hub/issues/351)
+- Entity modeling rendering incorrectly [\#347](https://github.com/marklogic/marklogic-data-hub/issues/347)
+
+## [v1.1.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.0) (2016-12-16)
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v2.0.0-alpha.1...v1.1.0)
+
+**Implemented enhancements:**
+
+- Detect when running upgraded hub [\#322](https://github.com/marklogic/marklogic-data-hub/issues/322)
+
+**Fixed bugs:**
+
+- if MarkLogic is not started, login reports "invalid username or password" [\#343](https://github.com/marklogic/marklogic-data-hub/issues/343)
+- Need gradle variables for Auth method for final, staging, etc [\#340](https://github.com/marklogic/marklogic-data-hub/issues/340)
+- Pagination not implemented on jobs page [\#320](https://github.com/marklogic/marklogic-data-hub/issues/320)
+
+**Closed issues:**
+
+- Directory slashes when typing in paths [\#341](https://github.com/marklogic/marklogic-data-hub/issues/341)
+- Scaffolding generation failed [\#338](https://github.com/marklogic/marklogic-data-hub/issues/338)
+- Investigating slow performance in loading modules on Windows [\#336](https://github.com/marklogic/marklogic-data-hub/issues/336)
+- Input Flow - Output URI replace configuration doesn't stick on windows [\#335](https://github.com/marklogic/marklogic-data-hub/issues/335)
+- Keep user database settings separate from hub database settings [\#325](https://github.com/marklogic/marklogic-data-hub/issues/325)
+- Create a non-admin user for doing hub stuff [\#200](https://github.com/marklogic/marklogic-data-hub/issues/200)
+
+## [v2.0.0-alpha.1](https://github.com/marklogic/marklogic-data-hub/tree/v2.0.0-alpha.1) (2016-11-30)
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.2...v2.0.0-alpha.1)
 
 **Implemented enhancements:**
 

CONTRIBUTING.md

@@ -39,6 +39,28 @@ cd /path/to/data-hub-project/
 gradle build -x test
 ```
 
+#### Running your local hub instead of the cloud hosted one
+```bash
+cd /path/to/data-hub-project/
+gradle publishToMavenLocal
+cd /path/to/data-hub-project/ml-data-hub-plugin
+gradle publishToMavenLocal
+```
+
+Then in your build.gradle file you will need to use the local version:
+```groovy
+buildscript {
+  repositories {
+    mavenLocal() 
+    jcenter()
+  } 
+  dependencies {
+    classpath "com.marklogic:ml-data-hub-plugin:(the version number you chose)"
+  }
+}
+apply plugin: "com.marklogic.ml-data-hub-plugin"
+```
+
 #### Running the QuickStart UI from source
 Make sure you have the prerequisites installed.
 

README.md

@@ -40,7 +40,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
 **Gradle**
 
 ```groovy
-compile('com.marklogic:marklogic-data-hub:2.0.0-alpha.1')
+compile('com.marklogic:marklogic-data-hub:2.0.0-alpha.2')
 ```
 
 **Maven**
@@ -49,15 +49,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-alpha.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>2.0.0-alpha.1</version>
+  <version>2.0.0-alpha.2</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-alpha.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-alpha.2'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -68,7 +68,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
 
 ```groovy
 plugins {
-    id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.1'
+    id 'com.marklogic.ml-data-hub' version '2.0.0-alpha.2'
 }
 ```
 
@@ -82,4 +82,4 @@ gradle tasks
 
 Feeling intrepid? Want to contrubute to the Data Hub Framework? Perhaps you just want to poke the code?
 
-Look at our [CONTRIBUTING.md](https://github.com/marklogic/marklogic-data-hub/blob/master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.
+Look at our [CONTRIBUTING.md](https://github.com/marklogic/marklogic-data-hub/blob/2.0-master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.

build.gradle

@@ -24,5 +24,5 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.6'
+    gradleVersion = '3.1'
 }

examples/.gitignore

@@ -2,4 +2,5 @@ config
 build.gradle
 gradle.properties
 gradle-local.properties
-marklogic-config/
+hub-internal-config/
+user-config/

examples/spring-batch/marklogic-config/databases/job-database.json

@@ -49,6 +49,14 @@
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
+    },
+    {
+      "scalar-type": "string",
+      "namespace-uri": "http://marklogic.com/spring-batch",
+      "localname": "status",
+      "collation": "http://marklogic.com/collation/",
+      "range-value-positions": false,
+      "invalid-values": "reject"
     }
   ],
   "path-namespace": [

examples/spring-batch/marklogic-config/databases/trace-database.json

@@ -28,24 +28,40 @@
     {
       "scalar-type": "string",
       "namespace-uri": "",
-      "localname": "traceId",
+      "localname": "hasError",
       "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
       "scalar-type": "string",
       "namespace-uri": "",
-      "localname": "identifier",
+      "localname": "flowType",
       "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
-      "scalar-type": "unsignedInt",
-      "namespace-uri": "http://marklogic.com/data-hub/debug",
-      "localname": "is-debugging-enabled",
-      "collation": "",
+      "scalar-type": "string",
+      "namespace-uri": "",
+      "localname": "jobId",
+      "collation": "http://marklogic.com/collation/codepoint",
+      "range-value-positions": false,
+      "invalid-values": "reject"
+    },
+    {
+      "scalar-type": "string",
+      "namespace-uri": "",
+      "localname": "traceId",
+      "collation": "http://marklogic.com/collation/codepoint",
+      "range-value-positions": false,
+      "invalid-values": "reject"
+    },
+    {
+      "scalar-type": "string",
+      "namespace-uri": "",
+      "localname": "identifier",
+      "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"
     },

gradle.properties

@@ -0,0 +1 @@
+version=2.0.0-alpha.2