Skip to content

Commit b6a19d0

Browse files
committed
prepping 2.0.0-rc.2
1 parent b81f844 commit b6a19d0

File tree

12 files changed

+98
-30
lines changed

12 files changed

+98
-30
lines changed

CHANGELOG.md

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,73 @@
11
# Change Log
22

3+
## [v2.0.0-rc.2](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.2)
4+
5+
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.5...v2.0.0-rc.2)
6+
7+
**Implemented enhancements:**
8+
9+
- Add Fastload support for MLCP [\#490](https://github.com/marklogic-community/marklogic-data-hub/issues/490)
10+
- Refactor to use main.xqy [\#484](https://github.com/marklogic-community/marklogic-data-hub/issues/484)
11+
- Refactor classes that break openjdk [\#482](https://github.com/marklogic-community/marklogic-data-hub/issues/482)
12+
13+
**Fixed bugs:**
14+
15+
- Next button not working when browsing to new hub project directory [\#502](https://github.com/marklogic-community/marklogic-data-hub/issues/502)
16+
- Quickstart gets stuck in Loading... with js error [\#501](https://github.com/marklogic-community/marklogic-data-hub/issues/501)
17+
- scaffolded flow from empty ES model has errors [\#495](https://github.com/marklogic-community/marklogic-data-hub/issues/495)
18+
- Need to properly escape the path for RegEx [\#494](https://github.com/marklogic-community/marklogic-data-hub/issues/494)
19+
- Files are being locked on Windows [\#450](https://github.com/marklogic-community/marklogic-data-hub/issues/450)
20+
21+
**Closed issues:**
22+
23+
- Increase gradleVersion to 3.4 for the wrapper task [\#499](https://github.com/marklogic-community/marklogic-data-hub/issues/499)
24+
- MLCP 9.0.2 isn't backwards compatible [\#498](https://github.com/marklogic-community/marklogic-data-hub/issues/498)
25+
- Example: Make a barebones example for cmd line ninjas [\#497](https://github.com/marklogic-community/marklogic-data-hub/issues/497)
26+
- ML behind Firewall + different ports [\#489](https://github.com/marklogic-community/marklogic-data-hub/issues/489)
27+
- Ports 8010 and 8011 conflicting with Ops-Director [\#447](https://github.com/marklogic-community/marklogic-data-hub/issues/447)
28+
29+
**Merged pull requests:**
30+
31+
- Support MLCP fastload [\#500](https://github.com/marklogic-community/marklogic-data-hub/pull/500) ([RobertSzkutak](https://github.com/RobertSzkutak))
32+
33+
## [v1.1.5](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.5) (2017-08-14)
34+
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v1.1.4...v1.1.5)
35+
36+
**Implemented enhancements:**
37+
38+
- Update Quickstart Ready message [\#478](https://github.com/marklogic-community/marklogic-data-hub/issues/478)
39+
- Example: Migrating a RDBMS to Data Hub using Spring Batch [\#473](https://github.com/marklogic-community/marklogic-data-hub/issues/473)
40+
41+
**Fixed bugs:**
42+
43+
- Providing different source/dest DB for the hubRunFlow does not work [\#488](https://github.com/marklogic-community/marklogic-data-hub/issues/488)
44+
- Path to code has wrong slash on Windows [\#467](https://github.com/marklogic-community/marklogic-data-hub/issues/467)
45+
- Job status stuck on STARTED for Input Flows [\#466](https://github.com/marklogic-community/marklogic-data-hub/issues/466)
46+
- File not saving properly from quickstart to fix a bug [\#430](https://github.com/marklogic-community/marklogic-data-hub/issues/430)
47+
- Error on initial run of QuickStart GUI [\#394](https://github.com/marklogic-community/marklogic-data-hub/issues/394)
48+
- Error saving entity - collation not legal [\#337](https://github.com/marklogic-community/marklogic-data-hub/issues/337)
49+
50+
**Closed issues:**
51+
52+
- collection name is hard coded in online store example [\#474](https://github.com/marklogic-community/marklogic-data-hub/issues/474)
53+
- add \(rest-extension-user,read\) to XML documents in modules-db [\#470](https://github.com/marklogic-community/marklogic-data-hub/issues/470)
54+
- column-width, or tooltip with full "Identifier" in traces table [\#469](https://github.com/marklogic-community/marklogic-data-hub/issues/469)
55+
- Initializing DHF Project against existing DB is dropping indexes [\#468](https://github.com/marklogic-community/marklogic-data-hub/issues/468)
56+
- Saving the changes in a flow code never finishes \*sometimes\* [\#462](https://github.com/marklogic-community/marklogic-data-hub/issues/462)
57+
- Sometimes a trace for a failed Harmonize job is not available/not existing [\#461](https://github.com/marklogic-community/marklogic-data-hub/issues/461)
58+
- Unable to ingest image \(.png\) documents using DHF Quick-Start application [\#420](https://github.com/marklogic-community/marklogic-data-hub/issues/420)
59+
- Load files into the data hub schemas database [\#288](https://github.com/marklogic-community/marklogic-data-hub/issues/288)
60+
- Ability to override uri for input flows [\#182](https://github.com/marklogic-community/marklogic-data-hub/issues/182)
61+
- Create concept of a domain [\#82](https://github.com/marklogic-community/marklogic-data-hub/issues/82)
62+
63+
**Merged pull requests:**
64+
65+
- Feature/473 msb example [\#480](https://github.com/marklogic-community/marklogic-data-hub/pull/480) ([sastafford](https://github.com/sastafford))
66+
- Some typos and suggestions [\#475](https://github.com/marklogic-community/marklogic-data-hub/pull/475) ([patrickmcelwee](https://github.com/patrickmcelwee))
67+
68+
## [v1.1.4](https://github.com/marklogic-community/marklogic-data-hub/tree/v1.1.4) (2017-07-25)
69+
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-rc.1...v1.1.4)
70+
371
## [v2.0.0-rc.1](https://github.com/marklogic-community/marklogic-data-hub/tree/v2.0.0-rc.1) (2017-07-24)
472
[Full Changelog](https://github.com/marklogic-community/marklogic-data-hub/compare/v2.0.0-beta.1...v2.0.0-rc.1)
573

@@ -661,4 +729,4 @@
661729

662730

663731

664-
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
732+
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

CONTRIBUTING.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Looking to build the code from source? Look no further.
2424
You need these to get started
2525

2626
- Java 8 JDK
27-
- Gradle (3.1 or greater)
27+
- Gradle (3.4 or greater)
2828
- Node JS 6.5 or newer
2929
- Typings `npm -g install typings`
3030
- A decent IDE. IntelliJ is nice.
@@ -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 '2.0.0-rc.1'
74+
// id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
7575
}
7676
7777
// this tells gradle to apply the plugin you included above in the buildscript section
@@ -128,10 +128,10 @@ your vision does not align with that of a project maintainer.
128128
#### Create a branch for your changes
129129

130130
Okay, so you have decided to fix something. Create a feature branch
131-
and start hacking. **Note** that we use git flow and thus our most recent changes live on the 2.0-develop branch.
131+
and start hacking. **Note** that we use git flow and thus our most recent changes live on the develop branch.
132132

133133
```sh
134-
$ git checkout -b my-feature-branch -t origin/2.0-develop
134+
$ git checkout -b my-feature-branch -t origin/develop
135135
```
136136

137137
#### Formatting code
@@ -181,7 +181,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
181181

182182
```sh
183183
$ git fetch upstream
184-
$ git rebase upstream/2.0-develop
184+
$ git rebase upstream/develop
185185
```
186186

187187

@@ -229,10 +229,10 @@ from the main (upstream) repository:
229229
git push origin --delete my-feature-branch
230230
```
231231

232-
* Check out the 2.0-develop branch:
232+
* Check out the develop branch:
233233

234234
```shell
235-
git checkout 2.0-develop -f
235+
git checkout develop -f
236236
```
237237

238238
* Delete the local branch:
@@ -241,10 +241,10 @@ from the main (upstream) repository:
241241
git branch -D my-feature-branch
242242
```
243243

244-
* Update your 2.0-develop with the latest upstream version:
244+
* Update your develop with the latest upstream version:
245245

246246
```shell
247-
git pull --ff upstream 2.0-develop
247+
git pull --ff upstream develop
248248
```
249249

250250
[issue tracker]: https://github.com/marklogic-community/marklogic-data-hub/issues

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ _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-community/marklogic-data-hub.svg?branch=2.0-master)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
8-
| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/2.0-master?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
7+
| Linux/Mac | [![Build Status](https://travis-ci.org/marklogic-community/marklogic-data-hub.svg?branch=master)](https://travis-ci.org/marklogic-community/marklogic-data-hub) |
8+
| Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv/branch/master?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub) |
99

1010
### Warning
1111
_This is the the 2.0 branch of The MarkLogic Data Hub Framework. The 2.0 version is only compatible with MarkLogic 9.0._
@@ -26,7 +26,7 @@ You need these to get started
2626

2727
- Java 8 JDK
2828
- MarkLogic 9.0 or greater
29-
- Gradle 3.1 or greater **(Optional)**
29+
- Gradle 3.4 or greater **(Optional)**
3030

3131
### TL;DR
3232

@@ -51,7 +51,7 @@ Alternatively you can include the jar file as a build dependency in your Java pr
5151
**Gradle**
5252

5353
```groovy
54-
compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
54+
compile('com.marklogic:marklogic-data-hub:2.0.0-rc.2')
5555
```
5656

5757
**Maven**
@@ -60,15 +60,15 @@ compile('com.marklogic:marklogic-data-hub:2.0.0-rc.1')
6060
<dependency>
6161
<groupId>com.marklogic</groupId>
6262
<artifactId>marklogic-data-hub</artifactId>
63-
<version>2.0.0-rc.1</version>
63+
<version>2.0.0-rc.2</version>
6464
<type>pom</type>
6565
</dependency>
6666
```
6767

6868
**Ivy**
6969

7070
```xml
71-
<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.1'>
71+
<dependency org='com.marklogic' name='marklogic-data-hub' rev='2.0.0-rc.2'>
7272
<artifact name='$AID' ext='pom'></artifact>
7373
</dependency>
7474
```
@@ -79,7 +79,7 @@ If you prefer to use gradle for all of your hub interactions then you can includ
7979

8080
```groovy
8181
plugins {
82-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
82+
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
8383
}
8484
```
8585

@@ -93,4 +93,4 @@ Now you have full access to the Data Hub tasks. To see all available tasks run:
9393

9494
Feeling intrepid? Want to contrubute to the Data Hub Framework? Perhaps you just want to poke the code?
9595

96-
Look at our [CONTRIBUTING.md](https://github.com/marklogic-community/marklogic-data-hub/blob/2.0-master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.
96+
Look at our [CONTRIBUTING.md](https://github.com/marklogic-community/marklogic-data-hub/blob/master/CONTRIBUTING.md#building-the-framework-from-source) file for details on building from source.

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ subprojects {
3333
}
3434

3535
task wrapper(type: Wrapper) {
36-
gradleVersion = '3.1'
36+
gradleVersion = '3.4'
3737
}

examples/barebones/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ plugins {
1313
// it includes ml-gradle. This plugin is what lets you
1414
// run DHF (Data Hub Framework) tasks from the
1515
// command line
16-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
16+
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
1717
}
1818
```
1919

examples/barebones/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ plugins {
77
// it includes ml-gradle. This plugin is what lets you
88
// run DHF (Data Hub Framework) tasks from the
99
// command line
10-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
10+
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
1111
}

examples/online-store/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The data are separated into 2 folders under the input/ folder.
1616
# TLDR; How do I run it?
1717
Check out the [Getting Started Tutorial](https://marklogic-community.github.io/marklogic-data-hub/) on the Datahub Site.
1818

19-
You will want to download the latest 2.x release of the [QuickStart Application](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.0-rc.1/quick-start-2.0.0-rc.1.war) and save it in this directory.
19+
You will want to download the latest 2.x release of the [QuickStart Application](https://github.com/marklogic-community/marklogic-data-hub/releases/download/v2.0.0-rc.2/quick-start-2.0.0-rc.2.war) and save it in this directory.
2020

2121
# Wait. What is a data Hub?
2222
Get started over at the [Data Hub Site](https://marklogic-community.github.io/marklogic-data-hub/what/)

examples/spring-batch/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'application'
44
id 'idea'
55
id 'net.saliman.properties' version '1.4.6'
6-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
6+
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
77
}
88

99
repositories {
@@ -13,7 +13,7 @@ repositories {
1313
}
1414

1515
dependencies {
16-
compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.1'
16+
compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.2'
1717
compile "com.marklogic:marklogic-spring-batch-core:1.0.1"
1818

1919
testCompile "com.h2database:h2:1.4.193"

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version=2.0.0-rc.1
1+
version=2.0.0-rc.2

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ plugins {
1919

2020
// This gradle plugin extends the ml-gradle plugin with
2121
// commands that make the Data Hub Framework do its magic
22-
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.1'
22+
id 'com.marklogic.ml-data-hub' version '2.0.0-rc.2'
2323
}
2424

2525
repositories {
@@ -30,6 +30,6 @@ repositories {
3030
dependencies {
3131
// this allows you to write custom java code that depends
3232
// on the Data Hub Framework library
33-
compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.1'
34-
compile 'com.marklogic:marklogic-xcc:9.0.1'
33+
compile 'com.marklogic:marklogic-data-hub:2.0.0-rc.2'
34+
compile 'com.marklogic:marklogic-xcc:9.0.2'
3535
}

0 commit comments

Comments
 (0)