Merge branch 'release/1.1.4' into 1.0-master

# Conflicts:
#	CHANGELOG.md
#	README.md

Author: paxtonhare

.gitignore

@@ -9,6 +9,7 @@ marklogic-data-hub/bin/
 marklogic-data-hub/src/main/resources/ml-modules/root/trace-ui
 quick-start/bin/
 build/
+out/
 releases/
 .classpath
 .project

.travis/Dockerfile-java

@@ -1,18 +1,27 @@
 FROM centos:centos7
 
 ENV LANG C.UTF-8
-ENV JAVA_VERSION 8u131
-ENV BUILD_VERSION b11
-ENV SUM d54c1d3a095b4ff2b6607d096fa80163
+ENV JAVA_VERSION 8u141
+ENV BUILD_VERSION b15
+ENV SUM 336fa29ff2bb4ef291e347e091f7f4a7
+
+# Get any CentOS updates then clear the Docker cache
+RUN yum makecache fast && \
+    yum -y update && yum clean all
+
+# Install MarkLogic dependencies
 RUN yum -y install glibc.i686 \
     gdb.x86_64 redhat-lsb.x86_64 vim \
     bzip2 \
     unzip \
-    wget \
-    xz-utils 2>&1 > /dev/null
+    xz-utils 2>&1 > /dev/null \
+    && yum clean all
+
+# Install the initscripts package so MarkLogic starts ok
+RUN yum -y install initscripts && yum clean all
 
 # Downloading Java
-RUN wget --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$SUM/jdk-$JAVA_VERSION-linux-x64.rpm" -O /tmp/jdk-8-linux-x64.rpm
+RUN curl -s -L -C - -b "oraclelicense=accept-securebackup-cookie" -o /tmp/jdk-8-linux-x64.rpm http://download.oracle.com/otn-pub/java/jdk/$JAVA_VERSION-$BUILD_VERSION/$SUM/jdk-$JAVA_VERSION-linux-x64.rpm
 RUN yum -y install /tmp/jdk-8-linux-x64.rpm
 
 RUN alternatives --install /usr/bin/java jar /usr/java/latest/bin/java 200000
@@ -21,6 +30,9 @@ RUN alternatives --install /usr/bin/javac javac /usr/java/latest/bin/javac 20000
 
 ENV JAVA_HOME /usr/java/latest
 
+# Set the Path
+ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/MarkLogic/mlcmd/bin
+
 # Install MarkLogic
 COPY ./MarkLogic.rpm /tmp/MarkLogic.rpm
 
@@ -29,6 +41,7 @@ RUN yum -y install /tmp/MarkLogic.rpm 2>&1 > /dev/null
 # Expose MarkLogic Server ports - add additional ones for your REST, etc
 # endpoints
 EXPOSE 7997-8020
+EXPOSE 5005
 
 # init
 COPY .travis/startml.sh /tmp/startml.sh
@@ -41,7 +54,7 @@ VOLUME /marklogic-data-hub
 ADD ./ /marklogic-data-hub
 WORKDIR /marklogic-data-hub
 
-RUN ./gradlew build -x test 2>&1 > /dev/null
+RUN ./gradlew resolveAllDependencies
 
 # Define default command (which avoids immediate shutdown)
-CMD /tmp/startml.sh && ./gradlew test
+CMD /tmp/startml.sh && ./gradlew clean && ./gradlew test

.travis/Dockerfile-ml

@@ -1,7 +1,73 @@
 # Change Log
 
-## [v1.1.3](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.3)
+## [v1.1.4](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.4)
 
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-rc.1...v1.1.4)
+
+**Fixed bugs:**
+
+- File not saving properly from quickstart to fix a bug [\#430](https://github.com/marklogic-community/marklogic-data-hub/issues/430)
+
+**Closed issues:**
+
+- Saving the changes in a flow code never finishes \*sometimes\* [\#462](https://github.com/marklogic-community/marklogic-data-hub/issues/462)
+
+## [v2.0.0-rc.1](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.1) (2017-07-24)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-beta.1...v2.0.0-rc.1)
+
+**Implemented enhancements:**
+
+- Cannot specify default permissions for data-hub-modules db [\#434](https://github.com/marklogic-community/marklogic-data-hub/issues/434)
+
+**Fixed bugs:**
+
+- MlcpRunner is being started improperly [\#452](https://github.com/marklogic-community/marklogic-data-hub/issues/452)
+- Code deploy fails when An entity is deleted [\#451](https://github.com/marklogic-community/marklogic-data-hub/issues/451)
+- error during data hub workshop [\#437](https://github.com/marklogic-community/marklogic-data-hub/issues/437)
+- when scaffolding code for an array, have it be empty list \[\] rather than null [\#432](https://github.com/marklogic-community/marklogic-data-hub/issues/432)
+- gradlew is generated without execute permission [\#428](https://github.com/marklogic-community/marklogic-data-hub/issues/428)
+- RunFlowTask using dyslexic string for hub key [\#419](https://github.com/marklogic-community/marklogic-data-hub/issues/419)
+
+**Closed issues:**
+
+- Upgrade quick-start to mlcp 9.0.2 [\#465](https://github.com/marklogic-community/marklogic-data-hub/issues/465)
+- QuickStart app doesn't work on Internet Explorer 11 [\#463](https://github.com/marklogic-community/marklogic-data-hub/issues/463)
+- Redeploy modules removes trace and debugging settings [\#460](https://github.com/marklogic-community/marklogic-data-hub/issues/460)
+- Quickstart Application not working on Internet Explorer [\#456](https://github.com/marklogic-community/marklogic-data-hub/issues/456)
+- Envelope instance created does not include "info" [\#455](https://github.com/marklogic-community/marklogic-data-hub/issues/455)
+- Error when creating a harmonize flow based on entity definition [\#454](https://github.com/marklogic-community/marklogic-data-hub/issues/454)
+- tutorial link is 404: https://marklogic.github.io/marklogic-data-hub/ [\#449](https://github.com/marklogic-community/marklogic-data-hub/issues/449)
+- Changes to $options not persisting if set in headers or triples in Harmonization flow [\#448](https://github.com/marklogic-community/marklogic-data-hub/issues/448)
+- Input flow job \(load-acme-tech\) failing on 2.0.0-beta.1 [\#446](https://github.com/marklogic-community/marklogic-data-hub/issues/446)
+- Fix AppVeyor CI [\#445](https://github.com/marklogic-community/marklogic-data-hub/issues/445)
+- consider using windows compatible line breaks [\#444](https://github.com/marklogic-community/marklogic-data-hub/issues/444)
+- RFE: support setting log level [\#442](https://github.com/marklogic-community/marklogic-data-hub/issues/442)
+- Setting replica forest data path [\#441](https://github.com/marklogic-community/marklogic-data-hub/issues/441)
+- Replica forests not created from quick-start [\#439](https://github.com/marklogic-community/marklogic-data-hub/issues/439)
+- Error in documentation for the REST transform [\#433](https://github.com/marklogic-community/marklogic-data-hub/issues/433)
+- Harmonization hits maximum document size in collector output [\#427](https://github.com/marklogic-community/marklogic-data-hub/issues/427)
+- Create a checklist for making DHF releases [\#424](https://github.com/marklogic-community/marklogic-data-hub/issues/424)
+- Expose the ability to set the writer plugin's target database in gradle [\#423](https://github.com/marklogic-community/marklogic-data-hub/issues/423)
+- Document all gradle hub tasks [\#402](https://github.com/marklogic-community/marklogic-data-hub/issues/402)
+- Document query-only mode for plugins [\#368](https://github.com/marklogic-community/marklogic-data-hub/issues/368)
+- Generated code template from Entity for nested item hides vars \(v2/Entities\) [\#353](https://github.com/marklogic-community/marklogic-data-hub/issues/353)
+- Control what runs in update mode to minimize locking [\#300](https://github.com/marklogic-community/marklogic-data-hub/issues/300)
+- Library Modules not being autodeployed [\#299](https://github.com/marklogic-community/marklogic-data-hub/issues/299)
+- Uninstall doesn't always finish on the UI [\#266](https://github.com/marklogic-community/marklogic-data-hub/issues/266)
+- Consider name and description for data hub framework and tooling [\#175](https://github.com/marklogic-community/marklogic-data-hub/issues/175)
+
+## [v2.0.0-beta.1](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-beta.1) (2017-05-31)
+[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.3...v2.0.0-beta.1)
+
+**Implemented enhancements:**
+
+- Add a code editor [\#418](https://github.com/marklogic-community/marklogic-data-hub/issues/418)
+
+**Fixed bugs:**
+
+- Entity properties starting with a capital generate templates with a preceding dash in var names [\#350](https://github.com/marklogic-community/marklogic-data-hub/issues/350)
+
+## [v1.1.3](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.3) (2017-05-24)
 [Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-alpha.4...v1.1.3)
 
 **Implemented enhancements:**

CHANGELOG.md

@@ -71,7 +71,7 @@ plugins {
    ...
 
    // comment out this line. It pulls the version from the cloud
-   // id 'com.marklogic.ml-data-hub' version '1.1.3'
+   // id 'com.marklogic.ml-data-hub' version '1.1.4'
 }
 
 // this tells gradle to apply the plugin you included above in the buildscript section

CONTRIBUTING.md

@@ -5,7 +5,7 @@ _The Data Hub Framework is free and open source under the [Apache 2 License](htt
 | OS | Status |
 | --- | --- |
 | Linux/Mac | [![Build Status](https://travis-ci.org/marklogic-community/marklogic-data-hub.svg?branch=1.0-master)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
-| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
+| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/1.0-master?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
 
 # MarkLogic Data Hub
 
@@ -46,7 +46,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
 **Gradle**
 
 ```groovy
-compile('com.marklogic:marklogic-data-hub:1.1.3')
+compile('com.marklogic:marklogic-data-hub:1.1.4')
 ```
 
 **Maven**
@@ -55,15 +55,15 @@ compile('com.marklogic:marklogic-data-hub:1.1.3')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>1.1.3</version>
+  <version>1.1.4</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.3'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.4'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -74,7 +74,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 '1.1.3'
+    id 'com.marklogic.ml-data-hub' version '1.1.4'
 }
 ```
 

README.md

@@ -1,3 +1,11 @@
+allprojects {
+    task resolveAllDependencies {
+        doLast {
+            configurations.all { it.resolve() }
+        }
+    }
+}
+
 subprojects {
     apply plugin: 'java'
 

build.gradle

@@ -2,7 +2,11 @@ version: '2'
 services:
   marklogic:
     image: marklogiccommunity/marklogic-datahub-1x
+    build:
+      context: .
+      dockerfile: ./.travis/Dockerfile-ml
     ports:
-      - "8000-8020"
+      - "5005:5005"
+      - "8000-8020:8000-8020"
     volumes:
       - .:/marklogic-data-hub

docker-compose.yml

@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.1.3'
+    id 'com.marklogic.ml-data-hub' version '1.1.4'
 }
 
 repositories {
@@ -12,7 +12,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.1.3'
+    compile 'com.marklogic:marklogic-data-hub:1.1.4'
     compile "com.marklogic:marklogic-spring-batch-core:0.7.4"
     compile 'com.marklogic:ml-javaclient-util:4.0.alpha4'
 

examples/spring-batch/build.gradle

@@ -1 +1 @@
-version=1.1.3
+version=1.1.4