prepping 1.1.1

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,33 @@
 # Change Log
 
-## [v1.1.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.0)
+## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.0...v1.1.1)
+
+**Implemented enhancements:**
+
+- customize session name to avoid conflicts [\#369](https://github.com/marklogic/marklogic-data-hub/issues/369)
+- Change Java Client API dependency to stable build [\#358](https://github.com/marklogic/marklogic-data-hub/issues/358)
+- Update Hub to use latest ml-gradle [\#355](https://github.com/marklogic/marklogic-data-hub/issues/355)
+
+**Closed issues:**
+
+- Entities and custom modules fail to deploy - v1.1.0 [\#377](https://github.com/marklogic/marklogic-data-hub/issues/377)
+- See if we can bail if the gradle version is too low [\#376](https://github.com/marklogic/marklogic-data-hub/issues/376)
+- Unable to login marklogic using hub frame work received  "500 Internal Server Error"  [\#374](https://github.com/marklogic/marklogic-data-hub/issues/374)
+- gradle plugin gets confused about users [\#371](https://github.com/marklogic/marklogic-data-hub/issues/371)
+- can't put binary inside envelope [\#366](https://github.com/marklogic/marklogic-data-hub/issues/366)
+- MLCP can't find /etc/hadooop [\#365](https://github.com/marklogic/marklogic-data-hub/issues/365)
+- Add CLA requirement to CONTRIBUTING [\#361](https://github.com/marklogic/marklogic-data-hub/issues/361)
+- Bug: QuickStart Login screen: Long paths aren't completely visible in Chrome [\#354](https://github.com/marklogic/marklogic-data-hub/issues/354)
+
+**Merged pull requests:**
+
+- Adds CLA requirement \(\#361\) [\#363](https://github.com/marklogic/marklogic-data-hub/pull/363) ([jmakeig](https://github.com/jmakeig))
+- Adds CLA requirement \(\#361\) [\#362](https://github.com/marklogic/marklogic-data-hub/pull/362) ([jmakeig](https://github.com/jmakeig))
+- Updates Java Client API dependency to stable build [\#359](https://github.com/marklogic/marklogic-data-hub/pull/359) ([jmakeig](https://github.com/jmakeig))
+
+## [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/v1.0.2...v1.1.0)
 
 **Implemented enhancements:**

CONTRIBUTING.md

@@ -36,15 +36,15 @@ To build the entire DHF (marklogic-data-hub.jar, quickstart.war, and ml-data-hub
 
 ```bash
 cd /path/to/data-hub-project/
-gradle build -x test
+./gradlew build -x test
 ```
 
 #### Running your local hub instead of the cloud hosted one
 ```bash
 cd /path/to/data-hub-project/
-gradle publishToMavenLocal
+./gradlew publishToMavenLocal
 cd /path/to/data-hub-project/ml-data-hub-plugin
-gradle publishToMavenLocal
+./gradlew publishToMavenLocal
 ```
 
 Then in your build.gradle file you will need to use the local version:
@@ -69,7 +69,7 @@ You will need to open two terminal windows.
 **Terminal window 1** - This runs the webapp.
 ```bash
 cd /path/to/data-hub-project
-gradle bootrun
+./gradlew bootrun
 ```
 
 **Terminal window 2** - This runs the Quickstart UI
@@ -174,7 +174,7 @@ $ git rebase upstream/1.0-develop
 Make sure the JUnit tests pass.
 
 ```sh
-$ gradle test
+$ ./gradlew test
 ```
 
 Make sure that all tests pass. Please, do not submit patches that fail.

README.md

@@ -5,7 +5,7 @@
 
 OS | Status
 --- | --- | ---
-Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=1.0-develop)](https://travis-ci.org/marklogic/marklogic-data-hub)
+Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=1.0-master)](https://travis-ci.org/marklogic/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)
 
 # MarkLogic Data Hub
@@ -47,7 +47,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.0')
+compile('com.marklogic:marklogic-data-hub:1.1.1')
 ```
 
 **Maven**
@@ -56,15 +56,15 @@ compile('com.marklogic:marklogic-data-hub:1.1.0')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.0'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.1'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -75,14 +75,14 @@ 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.0'
+    id 'com.marklogic.ml-data-hub' version '1.1.1'
 }
 ```
 
 Now you have full access to the Data Hub tasks. To see all available tasks run:
 
 ```bash
-gradle tasks
+./gradlew tasks
 ```
 
 # Building From Source

examples/spring-batch/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id 'idea'
     id 'application'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.1.0'
+    id 'com.marklogic.ml-data-hub' version '1.1.1'
 }
 
 repositories {
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.1.0'
+    compile 'com.marklogic:marklogic-data-hub:1.1.1'
     compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
     compile 'com.marklogic:ml-javaclient-util:2.12.1'
     testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'

gradle.properties

@@ -1 +1 @@
-version=1.1.0
+version=1.1.1

marklogic-data-hub/src/main/resources/scaffolding/build_gradle

@@ -3,7 +3,7 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'net.saliman.properties' version '1.4.6'
-    id 'com.marklogic.ml-data-hub' version '1.1.0'
+    id 'com.marklogic.ml-data-hub' version '1.1.1'
 }
 
 repositories {
@@ -12,6 +12,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.1.0'
-    compile 'com.marklogic:marklogic-xcc:8.0.5'
+    compile 'com.marklogic:marklogic-data-hub:1.1.1'
+    compile 'com.marklogic:marklogic-xcc:8.0.6'
 }

marklogic-data-hub/src/trace-ui/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "data-hub-quickstart",
-  "version": "1.1.0",
+  "name": "trace-ui",
+  "version": "1.1.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic/marklogic-data-hub",
   "angular-cli": {},

ml-data-hub-plugin/build.gradle

@@ -30,7 +30,7 @@ repositories {
 dependencies {
     compile gradleApi()
     compile project(":marklogic-data-hub")
-    compile 'com.marklogic:marklogic-xcc:8.0.5'
+    compile 'com.marklogic:marklogic-xcc:8.0.6'
     compile 'com.marklogic:ml-gradle:2.5.0'
 
     testCompile localGroovy()

quick-start/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-hub-quickstart",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "license": "APACHE",
   "homepage": "https://github.com/marklogic/marklogic-data-hub",
   "angular-cli": {},