Merge branch 'master' into dev

Author: rjrudin

README.md

@@ -1,12 +1,11 @@
 What is Gradle?
 ===============
 
-Gradle is a standard build tool that is used for building and deploying primarily Java applications, but it can be used for any codebase. 
-The full user guide for Gradle is available at http://www.gradle.org/docs/current/userguide/userguide.html. 
+Gradle is a standard build tool that is used for building and deploying primarily Java applications, but it can be used for any codebase. Check out the [Gradle user guide](http://www.gradle.org/docs/current/userguide/userguide.html) for more information.
 
 What is ml-gradle?
 =========
-ml-gradle is a [Gradle plugin](http://www.gradle.org/plugins "") that supports a number of tasks pertaining to deploying an 
+ml-gradle is a [Gradle plugin](https://plugins.gradle.org/ "") that supports a number of tasks pertaining to deploying an 
 application to MarkLogic and interacting with other features of MarkLogic via a Gradle build file. The bulk of the 
 functionality provided by ml-gradle is actually in [ml-app-deployer](https://github.com/rjrudin/ml-app-deployer) - ml-gradle 
 is just intended to be a thin wrapper around this library, exposing its functionality via Gradle tasks and properties.

examples/local-testing-project/gradle.properties

@@ -1,6 +1,6 @@
 # Set this to the version you used when running
 # "gradle -Pversion=(something) publishToMavenLocal" on your local ml-gradle repo
-mlGradleVersion=3.0-beta2
+mlGradleVersion=3.0.0
 
 mlHost=localhost
 mlAppName=example

examples/sample-project/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:3.0-alpha1"
+		classpath "com.marklogic:ml-gradle:3.0.0"
 	}
 }
 
@@ -53,7 +53,7 @@ configurations {
  */
 dependencies {
 	// Needed to compile and run the JUnit tests
-	testCompile "com.marklogic:ml-junit:3.0-alpha1"
+	testCompile "com.marklogic:ml-junit:3.0.0"
 	testCompile "com.jayway.restassured:rest-assured:2.4.1"
 
 	// corb jar available from jcenter

examples/sample-project/src/test/java/sample/GetClientConfigTest.java

@@ -2,7 +2,7 @@
 
 import org.junit.Test;
 
-import com.marklogic.client.ext.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.DatabaseClientConfig;
 
 public class GetClientConfigTest extends AbstractSampleProjectTest {
 

examples/sample-project/src/test/java/sample/SampleProjectTestConfig.java

@@ -4,7 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 
-import com.marklogic.client.ext.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.DatabaseClientConfig;
 import com.marklogic.junit.spring.BasicTestConfig;
 
 @Configuration

examples/sample-project/src/test/java/sample/SearchDocumentsViaRestAssuredTest.java

@@ -9,7 +9,7 @@
 import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.path.json.JsonPath;
 import com.marklogic.client.document.XMLDocumentManager;
-import com.marklogic.client.ext.helper.DatabaseClientConfig;
+import com.marklogic.client.ext.DatabaseClientConfig;
 import com.marklogic.client.io.DocumentMetadataHandle;
 import com.marklogic.client.io.Format;
 import com.marklogic.client.io.StringHandle;