Skip to content

Commit 5e9940b

Browse files
committed
prepping 1.1.2
1 parent cbb2a44 commit 5e9940b

File tree

24 files changed

+89
-357
lines changed

24 files changed

+89
-357
lines changed

CHANGELOG.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
# Change Log
22

3-
## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1)
3+
## [v1.1.2](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.2)
44

5+
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.1...v1.1.2)
6+
7+
**Fixed bugs:**
8+
9+
- null pointer exception on logout [\#383](https://github.com/marklogic/marklogic-data-hub/issues/383)
10+
11+
**Closed issues:**
12+
13+
- gradle version check fails on multiple dots [\#384](https://github.com/marklogic/marklogic-data-hub/issues/384)
14+
- QuickStart Template Compile Error 2.0-alpha.2 [\#380](https://github.com/marklogic/marklogic-data-hub/issues/380)
15+
16+
## [v1.1.1](https://github.com/marklogic/marklogic-data-hub/tree/v1.1.1) (2017-03-20)
517
[Full Changelog](https://github.com/marklogic/marklogic-data-hub/compare/v1.1.0...v1.1.1)
618

719
**Implemented enhancements:**

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ plugins {
7171
...
7272
7373
// comment out this line. It pulls the version from the cloud
74-
// id 'com.marklogic.ml-data-hub' version '1.1.1'
74+
// id 'com.marklogic.ml-data-hub' version '1.1.2'
7575
}
7676
7777
// this tells gradle to apply the plugin you included above in the buildscript section

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ _The Data Hub Framework is free and open source under the [Apache 2 License](htt
44

55
| OS | Status |
66
| --- | --- |
7-
| 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) |
7+
| 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) |
88
| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
99

1010
# MarkLogic Data Hub
@@ -46,7 +46,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
4646
**Gradle**
4747

4848
```groovy
49-
compile('com.marklogic:marklogic-data-hub:1.1.1')
49+
compile('com.marklogic:marklogic-data-hub:1.1.2')
5050
```
5151

5252
**Maven**
@@ -55,15 +55,15 @@ compile('com.marklogic:marklogic-data-hub:1.1.1')
5555
<dependency>
5656
<groupId>com.marklogic</groupId>
5757
<artifactId>marklogic-data-hub</artifactId>
58-
<version>1.1.1</version>
58+
<version>1.1.2</version>
5959
<type>pom</type>
6060
</dependency>
6161
```
6262

6363
**Ivy**
6464

6565
```xml
66-
<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.1'>
66+
<dependency org='com.marklogic' name='marklogic-data-hub' rev='1.1.2'>
6767
<artifact name='$AID' ext='pom'></artifact>
6868
</dependency>
6969
```
@@ -74,7 +74,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
7474

7575
```groovy
7676
plugins {
77-
id 'com.marklogic.ml-data-hub' version '1.1.1'
77+
id 'com.marklogic.ml-data-hub' version '1.1.2'
7878
}
7979
```
8080

examples/spring-batch/build.gradle

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
buildscript {
2+
repositories {
3+
maven {url 'http://developer.marklogic.com/maven2/'}
4+
}
5+
}
6+
17
plugins {
28
id 'java'
39
id 'eclipse'
410
id 'idea'
511
id 'application'
612
id 'net.saliman.properties' version '1.4.6'
7-
id 'com.marklogic.ml-data-hub' version '1.1.1'
13+
id 'com.marklogic.ml-data-hub' version '1.1.2'
814
}
915

1016
repositories {
@@ -13,9 +19,9 @@ repositories {
1319
}
1420

1521
dependencies {
16-
compile 'com.marklogic:marklogic-data-hub:1.1.1'
22+
compile 'com.marklogic:marklogic-data-hub:1.1.2'
1723
compile 'com.marklogic:marklogic-spring-batch-core:0.6.0'
18-
compile 'com.marklogic:ml-javaclient-util:2.12.1'
24+
compile 'com.marklogic:ml-javaclient-util:2.13.0'
1925
testCompile 'com.marklogic:marklogic-spring-batch-test:0.6.0'
2026
}
2127

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

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

Lines changed: 0 additions & 83 deletions
This file was deleted.

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

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 3 deletions
This file was deleted.

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

Lines changed: 0 additions & 50 deletions
This file was deleted.

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

Lines changed: 0 additions & 82 deletions
This file was deleted.

0 commit comments

Comments
 (0)