Skip to content

Commit 0587e07

Browse files
committed
updating branch names
updating minimum gradle version
1 parent d37a62e commit 0587e07

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

CONTRIBUTING.md

Lines changed: 8 additions & 8 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 (the newer the better)
27+
- Gradle (3.1 or greater)
2828
- Node JS 6.5 or newer
2929
- Typings `npm -g install typings`
3030
- A decent IDE. IntelliJ is nice.
@@ -90,10 +90,10 @@ your vision does not align with that of a project maintainer.
9090
#### Create a branch for your changes
9191

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

9595
```sh
96-
$ git checkout -b my-feature-branch -t origin/develop
96+
$ git checkout -b my-feature-branch -t origin/1.0-develop
9797
```
9898

9999
#### Formatting code
@@ -143,7 +143,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
143143

144144
```sh
145145
$ git fetch upstream
146-
$ git rebase upstream/develop
146+
$ git rebase upstream/1.0-develop
147147
```
148148

149149

@@ -187,10 +187,10 @@ from the main (upstream) repository:
187187
git push origin --delete my-feature-branch
188188
```
189189

190-
* Check out the develop branch:
190+
* Check out the 1.0-develop branch:
191191

192192
```shell
193-
git checkout develop -f
193+
git checkout 1.0-develop -f
194194
```
195195

196196
* Delete the local branch:
@@ -199,10 +199,10 @@ from the main (upstream) repository:
199199
git branch -D my-feature-branch
200200
```
201201

202-
* Update your develop with the latest upstream version:
202+
* Update your 1.0-develop with the latest upstream version:
203203

204204
```shell
205-
git pull --ff upstream develop
205+
git pull --ff upstream 1.0-develop
206206
```
207207

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

README.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
OS | Status
44
--- | --- | ---
5-
Linux/Mac | [![Build Status](https://travis-ci.org/marklogic/marklogic-data-hub.svg?branch=master)](https://travis-ci.org/marklogic/marklogic-data-hub)
5+
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)
66
Windows | [![Windows Build status](https://ci.appveyor.com/api/projects/status/kgj0k5na59uhkvbv?svg=true)](https://ci.appveyor.com/project/paxtonhare/marklogic-data-hub)
77

88
# MarkLogic Data Hub
@@ -13,6 +13,14 @@ This project allows you to deploy a skeleton Data Hub into MarkLogic. With some
1313

1414
# Getting Started
1515

16+
###Prerequisites
17+
18+
You need these to get started
19+
20+
- Java 8 JDK
21+
- MarkLogic 8.0-2 or greater
22+
- Gradle 3.1 or greater **(Optional)**
23+
1624
###TL;DR
1725

1826
Head over to our [Getting Started Tutorial](https://marklogic.github.io/marklogic-data-hub/) to get up and running with the Data Hub.

0 commit comments

Comments
 (0)