Merge branch 'release/1.1.2' into 1.0-master

Author: paxtonhare

.travis.yml

@@ -7,5 +7,4 @@ before_install:
  - ./.travis/download.sh
 
 script:
-  - docker-compose build
   - docker-compose run marklogic

.travis/Dockerfile-ml

@@ -29,7 +29,7 @@ VOLUME /marklogic-data-hub
 ADD ./ /marklogic-data-hub
 WORKDIR /marklogic-data-hub
 
-RUN ./gradlew tasks 2>&1 > /dev/null
+RUN ./gradlew build -x test 2>&1 > /dev/null
 
 # Define default command (which avoids immediate shutdown)
 CMD /tmp/startml.sh && ./gradlew test

.travis/download.sh

@@ -1,34 +1,7 @@
 #!/bin/bash
 
-# runs command from parameters and exits with the eoror code of the command
-# if it fails
-function successOrExit {
-    "$@"
-    local status=$?
-    if [ $status -ne 0 ]; then
-        echo "$1 exited with error: $status"
-        exit $status
-    fi
-}
+echo "Logging in to Docker registry"
+docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}
 
-set | grep TRAVIS
-
-test $1 && arg1=$1
-
-ver=${ML_VERSION}
-fname=MarkLogic-RHEL7-${ver}.x86_64.rpm
-fnamedeb="marklogic_"
-fnamedeb=$fnamedeb$ver
-suff="_amd64.deb"
-fnamedeb=$fnamedeb$suff
-
-echo "Logging in for Download"
-curl -s -c cookies.txt --data "email=${MLBUILD_USER}&password=${MLBUILD_PASSWORD}" https://developer.marklogic.com/login > /dev/null 2>&1
-
-echo
-echo "Getting Download Link"
-dl_link=$(curl -s -b cookies.txt --data "download=/download/binaries/8.0/${fname}" https://developer.marklogic.com/get-download-url | perl -pe 's/.*"path":"([^"]+).*/\1/')
-url="https://developer.marklogic.com${dl_link}"
-
-echo "********* Downloading MarkLogic $ver"
-successOrExit curl -s -k -o ./MarkLogic.rpm $url
+echo "Getting Docker Image"
+docker pull paxtonhare/marklogic-datahub-1x

CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1)
+## [v1.1.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.2)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.1...v1.1.2)
+
+**Fixed bugs:**
+
+- null pointer exception on logout [\#383](https://github.com/marklogic/marklogic-data-hub/issues/383)
+
+**Closed issues:**
+
+- gradle version check fails on multiple dots [\#384](https://github.com/marklogic/marklogic-data-hub/issues/384)
+- QuickStart Template Compile Error 2.0-alpha.2 [\#380](https://github.com/marklogic/marklogic-data-hub/issues/380)
+
+## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1) (2017-03-20)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.0...v1.1.1)
 
 **Implemented enhancements:**

CONTRIBUTING.md

@@ -39,7 +39,12 @@ cd /path/to/data-hub-project/
 ./gradlew build -x test
 ```
 
-#### Running your local hub instead of the cloud hosted one
+#### Making Changes to the Hub Gradle Plugin
+
+This is for when you are making changes to the ml-data-hub-plugin. This is a gradle plugin that enables Hub Capabilities. Most likely you won't find yourself doing this. You can safely ignore this section.
+
+Still here? Seems you really want to modify the Gradle Plugin. Here's how to tell Gradle to use your local copy instead of the one living up on the Cloud.
+
 ```bash
 cd /path/to/data-hub-project/
 ./gradlew publishToMavenLocal
@@ -49,6 +54,9 @@ cd /path/to/data-hub-project/ml-data-hub-plugin
 
 Then in your build.gradle file you will need to use the local version:
 ```groovy
+
+// this goes at the top above the plugins section
+
 buildscript {
   repositories {
     mavenLocal() 
@@ -58,6 +66,15 @@ buildscript {
     classpath "com.marklogic:ml-data-hub:(the version number you chose)"
   }
 }
+
+plugins {
+   ...
+
+   // comment out this line. It pulls the version from the cloud
+   // id 'com.marklogic.ml-data-hub' version '1.1.2'
+}
+
+// this tells gradle to apply the plugin you included above in the buildscript section
 apply plugin: "com.marklogic.ml-data-hub"
 ```
 

README.md

@@ -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.1')
+compile('com.marklogic:marklogic-data-hub:1.1.2')
 ```
 
 **Maven**
@@ -55,15 +55,15 @@ compile('com.marklogic:marklogic-data-hub:1.1.1')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.1'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.2'>
   <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.1'
+    id 'com.marklogic.ml-data-hub' version '1.1.2'
 }
 ```
 

docker-compose.yml

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

examples/spring-batch/build.gradle

@@ -1,10 +1,16 @@
+buildscript {
+  repositories {
+    maven {url 'http://developer.marklogic.com/maven2/'}
+  }
+}
+
 plugins {
     id 'java'
     id 'eclipse'
     id 'idea'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.1.1'
+    id 'com.marklogic.ml-data-hub' version '1.1.2'
 }
 
 repositories {
@@ -13,9 +19,9 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.1.1'
+    compile 'com.marklogic:marklogic-data-hub:1.1.2'
     compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
-    compile 'com.marklogic:ml-javaclient-util:2.12.1'
+    compile 'com.marklogic:ml-javaclient-util:2.13.0'
     testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'
 }