Merge branch 'release/3.0.0'

Author: aebadirad

CHANGELOG.md

@@ -24,11 +24,32 @@ Looking to build the code from source? Look no further.
 #### Prerequisites
 You need these to get started
 
-- MarkLogic 9+
+- MarkLogic 9.0-nightly or 9.0-5+
 - Java 8 JDK
 - Gradle (3.4 or greater)
 - A decent IDE. IntelliJ is nice.
 
+#### Symlinking to MarkLogic
+The 3.0 release of DHF will ship its xqy and sjs code within MarkLogic.
+To run in development mode against MarkLogic you will need:
+`MarkLogic 9.0-2018-02-14 or greater`
+
+If you wish to make code changes to the xqy or sjs files within DHF you will need to symlink your source code into the /MarkLogic install dir so that MarkLogic serves up your files instead of the ones bundled in the nightly.
+
+In Linux or Mac, run the following:
+
+```bash
+ln -s /path/to/your/dhf/code/marklogic-data-hub/src/server-side \
+  /path/to/MarkLogic/Modules/MarkLogic/data-hub-framework
+```
+
+In Windows, run a Command Prompt as Admin, then execute the following:
+
+```bash
+cd \path\to\MarkLogic\Modules\MarkLogic
+mklink /D data-hub-framework \path\to\your\dhf\code\marklogic-data-hub\src\server-side
+```
+
 #### Building from the command line
 **First, a warning.** _The DHF has a ton of tests and they take a very long time to run. Considering you might not want to invest 30 minutes to wait for tests these instructions will show you how to skip the tests._
 
@@ -75,7 +96,7 @@ plugins {
    ...
 
    // comment out this line. It pulls the version from the cloud
-   // id 'com.marklogic.ml-data-hub' version '2.0.4'
+   // id 'com.marklogic.ml-data-hub' version '3.0.0'
 }
 
 // this tells gradle to apply the plugin you included above in the buildscript section
@@ -152,15 +173,15 @@ git checkout develop
 #### Do you have the latest code?
 Better make sure...
 
-##### You clone from the github.com/marklogic-community/marklogic-data-hub repo
+##### You clone from the github.com/marklogic/marklogic-data-hub repo
 
 ```bash
 git pull origin develop
 ```
 ##### Your forked then cloned your fork
 Make sure you have the upstream set:
 ```bash
-$ git remote add upstream git://github.com/marklogic-community/marklogic-data-hub.git
+$ git remote add upstream git://github.com/marklogic/marklogic-data-hub.git
 ```
 
 Then fetch the upstream:
@@ -193,13 +214,13 @@ features, by not reporting duplicate issues. Please fill out the issue template
 
 #### Fork marklogic-data-hub
 
-Fork the project [on GitHub](https://github.com/marklogic-community/marklogic-data-hub/fork) and clone
+Fork the project [on GitHub](https://github.com/marklogic/marklogic-data-hub/fork) and clone
 your copy.
 
 ```sh
 $ git clone [email protected]:username/marklogic-data-hub.git
 $ cd marklogic-data-hub
-$ git remote add upstream git://github.com/marklogic-community/marklogic-data-hub.git
+$ git remote add upstream git://github.com/marklogic/marklogic-data-hub.git
 ```
 
 We ask that you open an issue in the [issue tracker][] and get agreement from
@@ -358,5 +379,5 @@ from the main (upstream) repository:
     git pull --ff upstream develop
     ```
 
-[issue tracker]: https://github.com/marklogic-community/marklogic-data-hub/issues
+[issue tracker]: https://github.com/marklogic/marklogic-data-hub/issues
 [.editorconfig]: http://editorconfig.org/

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 
-Copyright © 2017 MarkLogic Corporation.
+Copyright © 2018 MarkLogic Corporation.
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at