Merge branch 'release/1.1.0' into 1.0-develop

Author: paxtonhare

CHANGELOG.md

@@ -1,7 +1,29 @@
 # Change Log
 
-## [v1.0.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.2)
+## [v1.1.0](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.0)
 
+[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.2...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)
+
+## [v1.0.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.0.2) (2016-11-22)
 [Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.0.1...v1.0.2)
 
 **Fixed bugs:**

README.md

@@ -44,7 +44,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.0.2')
+compile('com.marklogic:marklogic-data-hub:1.1.0')
 ```
 
 **Maven**
@@ -53,15 +53,15 @@ compile('com.marklogic:marklogic-data-hub:1.0.2')
 <dependency>
   <groupId>com.marklogic</groupId>
   <artifactId>marklogic-data-hub</artifactId>
-  <version>1.0.2</version>
+  <version>1.1.0</version>
   <type>pom</type>
 </dependency>
 ```
 
 **Ivy**
 
 ```xml
-<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.0.2'>
+<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.0'>
   <artifact name='$AID' ext='pom'></artifact>
 </dependency>
 ```
@@ -72,7 +72,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.0.2'
+    id 'com.marklogic.ml-data-hub' version '1.1.0'
 }
 ```
 

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.0.2'
+    id 'com.marklogic.ml-data-hub' version '1.1.0'
 }
 
 repositories {
@@ -13,7 +13,7 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.2'
+    compile 'com.marklogic:marklogic-data-hub:1.1.0'
     compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
     compile 'com.marklogic:ml-javaclient-util:2.9.1'
     testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'

gradle.properties

@@ -1 +1 @@
-version=1.0.2
+version=1.1.0

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.0.2'
+    id 'com.marklogic.ml-data-hub' version '1.1.0'
 }
 
 repositories {
@@ -12,6 +12,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.marklogic:marklogic-data-hub:1.0.2'
+    compile 'com.marklogic:marklogic-data-hub:1.1.0'
     compile 'com.marklogic:marklogic-xcc:8.0.5'
 }

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

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

quick-start/package.json

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