Merge branch 'dev'

Author: rjrudin

README.md

@@ -24,7 +24,7 @@ First, [install Gradle](https://gradle.org/install/).
 
 Then, in an empty directory, create a file named "build.gradle" with your favorite text editor and enter the following:
 
-    plugins { id "com.marklogic.ml-gradle" version "3.9.0" }
+    plugins { id "com.marklogic.ml-gradle" version "3.10.0" }
 
 Then run:
 

build.gradle

@@ -15,11 +15,6 @@ targetCompatibility = "1.8"
 repositories {
   mavenLocal() // Used for local development only
   jcenter()
-
-	// Needed until ml-unit-test is available via jcenter()
-	maven {
-		url {"https://dl.bintray.com/rjrudin/maven/"}
-	}
 }
 
 dependencies {

examples/corb2-project/build.gradle

@@ -18,12 +18,12 @@ buildscript {
   }
   dependencies {
     //Needed for CorbTask to dynamicaly generate properties from CORB Options class
-    classpath 'com.marklogic:marklogic-corb:2.3.2'
+    classpath 'com.marklogic:marklogic-corb:2.4.1'
   }
 }
 
 plugins {
-    id "com.marklogic.ml-gradle" version "3.6.0"
+    id "com.marklogic.ml-gradle" version "3.9.0"
 }
 
 repositories {
@@ -42,7 +42,7 @@ configurations {
 
 dependencies {
     // required to run CoRB2
-    corb 'com.marklogic:marklogic-corb:2.3.2'
+    corb 'com.marklogic:marklogic-corb:2.4.1'
     // optional
     //corb 'org.jasypt:jasypt:1.9.2' // would be necessary to leverage JasyptDecrypter
 }
@@ -97,7 +97,7 @@ task corb(type: com.marklogic.gradle.task.CorbTask) {
  * the transform.xqy module to perform any action that you would like - this is just to show how to invoke corb from Gradle.
  */
 task corbAdhoc(type: com.marklogic.gradle.task.CorbTask) {
-    xccConnectionUri = contentXccUrl
+		xccConnectionUri = contentXccUrl
     urisModule = "src/main/ml-modules/ext/corb2-project/corb/uris.xqy|ADHOC"
     processModule = "src/main/ml-modules/ext/corb2-project/corb/transform.xqy|ADHOC"
 }

examples/local-testing-project/README.md

@@ -4,11 +4,10 @@ that you've published to your local Maven repository.
 To publish an instance of ml-gradle locally, just do the following:
 
 1. From the ml-gradle root directory, run "publish -Pversion=DEV publishToMavenLocal" (you can pick any version name that you want)
-1. Verify manually that the library was published to ~/.m2/com/marklogic/ml-gradle
+1. Verify manually that the library was published to ~/.m2/repository/com/marklogic/ml-gradle
 
 You should then be able to run "gradle tasks" on this project, and that will use your
 locally published copy of ml-gradle. Again, feel free to change the version name to whatever
 you want, there's no requirement to use "DEV". 
 
-Note that the "src" directory is gitignore'd in this project so that you can add any artifacts you want. 
- 
+Note that the "src" directory is gitignore'd in this project so that you can add any artifacts you want.

examples/sample-project/build.gradle

@@ -8,7 +8,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath "com.marklogic:ml-gradle:3.8.0"
+		classpath "com.marklogic:ml-gradle:3.10.0"
 	}
 }
 

examples/unit-test-project/README.md

@@ -1,30 +1,30 @@
-This project shows an example of using the ml-unit-test framework to run server-side tests within MarkLogic.
+This project shows an example of using the marklogic-unit-test framework to run server-side tests within MarkLogic.
 
-## Enabling ml-unit-test in an ml-gradle project 
+## Enabling marklogic-unit-test in an ml-gradle project 
 
-Using ml-unit-test requires two additions to the build.gradle file, as described below.
+Using marklogic-unit-test requires two additions to the build.gradle file, as described below.
 
-First, ml-gradle includes an "mlUnitTest" task, which depends on the ml-unit-test-client JAR file. ml-gradle does not
-include this by default (not every ml-gradle user will use ml-unit-test), so it must be added to the buildscript:
+First, ml-gradle includes an "mlUnitTest" task, which depends on the marklogic-unit-test-client JAR file. ml-gradle does not
+include this by default (not every ml-gradle user will use marklogic-unit-test), so it must be added to the buildscript:
 
     buildscript {
       repositories {
         jcenter()
       }
       dependencies {
-        classpath "com.marklogic:ml-unit-test-client:0.11.1"
+        classpath "com.marklogic:marklogic-unit-test-client:0.12.0"
       }
     }
 
-Next, the ml-unit-test framework is depended on and installed as an "mlRestApi" dependency (the "mlRestApi" configuration
+Next, the marklogic-unit-test framework is depended on and installed as an "mlRestApi" dependency (the "mlRestApi" configuration
 is a feature of ml-gradle for depending on packages of MarkLogic modules):
 
     repositories {
       jcenter()
     }
       
     dependencies {
-      mlRestApi "com.marklogic:ml-unit-test-modules:0.11.1"
+      mlRestApi "com.marklogic:marklogic-unit-test-modules:0.12.0"
     }
 
 ## Running unit tests
@@ -36,7 +36,7 @@ First, deploy the application:
 
     gradle mlDeploy
 
-This will deploy the application along with the ml-unit-test modules.
+This will deploy the application along with the marklogic-unit-test modules.
 
 Then, run the tests:
 
@@ -45,17 +45,17 @@ Then, run the tests:
 Two tests are run, and one should fail, so you can see what a failed test looks like. 
 
 This project includes the Gradle Java plugin, which allows you to run tests under src/test/java. This project includes
-an example of a JUnit Parameterized test that invokes each ml-unit-test module separately - you can try it like this:
+an example of a JUnit Parameterized test that invokes each marklogic-unit-test module separately - you can try it like this:
 
     gradle test
 
 Again, two tests will run, and one will intentionally fail. The Parameterized test can be run in an IDE as well, allowing
 you to take advantage of your IDE's support for JUnit tests.
 
-You can also access the ml-unit-test REST endpoints directly:
+You can also access the marklogic-unit-test REST endpoints directly:
 
-- List the tests - http://localhost:8135/v1/resources/ml-unit-test
-- Run a test suite - http://localhost:8135/v1/resources/ml-unit-test?rs:func=run&rs:suite=My%20Tests
+- List the tests - http://localhost:8135/v1/resources/marklogic-unit-test
+- Run a test suite - http://localhost:8135/v1/resources/marklogic-unit-test?rs:func=run&rs:suite=My%20Tests
 
 And you can run the original UI test runner by going to:
 

examples/unit-test-project/build.gradle

@@ -1,9 +1,10 @@
 buildscript {
   repositories {
     jcenter()
+	  mavenLocal()
   }
   dependencies {
-	  classpath "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
+	  classpath "com.marklogic:marklogic-unit-test-client:${marklogicUnitTestVersion}"
     classpath "com.marklogic:ml-gradle:${mlGradleVersion}"
   }
 }
@@ -16,9 +17,9 @@ repositories {
 }
 
 dependencies {
-	mlRestApi "com.marklogic:ml-unit-test-modules:${mlUnitTestVersion}"
+	mlRestApi "com.marklogic:marklogic-unit-test-modules:${marklogicUnitTestVersion}"
 
-	// For running ml-unit-test tests via JUnit
-	testCompile "com.marklogic:ml-unit-test-client:${mlUnitTestVersion}"
+	// For running marklogic-unit-test tests via JUnit
+	testCompile "com.marklogic:marklogic-unit-test-client:${marklogicUnitTestVersion}"
 	testCompile "junit:junit:4.12"
 }

examples/unit-test-project/gradle.properties

@@ -1,5 +1,5 @@
-mlGradleVersion=3.7.1
-mlUnitTestVersion=0.11.1
+mlGradleVersion=3.10.0
+marklogicUnitTestVersion=0.12.0
 
 mlHost=localhost
 mlAppName=unit-test-example

gradle.properties

@@ -1,8 +1,8 @@
 group=com.marklogic
-version=3.9.0
+version=3.10.0
 javadocsDir=../gh-pages-marklogic-java/javadocs
 
-mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.9.0
+mlAppDeployerDependency=com.marklogic:ml-app-deployer:3.10.0
 mlcpUtilDependency=com.marklogic:mlcp-util:0.9.0
 mlDataMovementDependency=com.marklogic:marklogic-data-movement-components:1.1
-mlUnitTestDependency=com.marklogic:ml-unit-test-client:0.11.1
+mlUnitTestDependency=com.marklogic:marklogic-unit-test-client:0.12.0

src/main/groovy/com/marklogic/gradle/MarkLogicPlugin.groovy

@@ -97,9 +97,11 @@ class MarkLogicPlugin implements Plugin<Project> {
 		project.task("mlPostDeploy", group: deployGroup, description: "Add dependsOn to this task to add tasks at the end of mlDeploy").mustRunAfter(["mlDeployApp"])
 		project.task("mlPostUndeploy", group: deployGroup, description: "Add dependsOn to this task to add tasks at the end of mlUndeploy").mustRunAfter(["mlUndeployApp"])
 		project.task("mlDeploy", group: deployGroup, dependsOn: ["mlDeployApp", "mlPostDeploy"],
-			description: "Deploys all application resources in the configuration directory and allows for additional steps via mlPostDeploy.dependsOn. Use -Pignore to specify a comma-delimited list of short class names of ml-app-deployer command classes to ignore while deploying.").mustRunAfter("mlClearModulesDatabase")
-		project.task("mlUndeploy", group: deployGroup, dependsOn: ["mlUndeployApp", "mlPostUndeploy"], description: "Undeploys all application resources in the configuration directory and allows for additional steps via mlPostUndeploy.dependsOn; requires -Pconfirm=true to be set so this isn't accidentally executed")
-		project.task("mlRedeploy", group: deployGroup, dependsOn: ["mlClearModulesDatabase", "mlDeploy"], description: "Clears the modules database and then deploys the application")
+			description: "Deploys all application resources in the configuration directory and allows for additional steps via mlPostDeploy.dependsOn. Use -Pignore to specify a comma-delimited list of short class names of ml-app-deployer command classes to ignore while deploying.")
+			.mustRunAfter("mlClearModulesDatabase", "mlDeleteResourceTimestampsFile")
+		project.task("mlUndeploy", group: deployGroup, dependsOn: ["mlUndeployApp", "mlPostUndeploy", "mlDeleteResourceTimestampsFile"], description: "Undeploys all application resources in the configuration directory and allows for additional steps via mlPostUndeploy.dependsOn; requires -Pconfirm=true to be set so this isn't accidentally executed")
+		project.task("mlRedeploy", group: deployGroup, dependsOn: ["mlClearModulesDatabase", "mlDeploy", "mlDeleteResourceTimestampsFile"], description: "Clears the modules database and then deploys the application")
+		project.task("mlDeleteResourceTimestampsFile", type: DeleteResourceTimestampsFileTask, group: deployGroup, description: "Delete the properties file in the build directory (stored there by default) that keeps track of when each resource was last deployed; the file path can be overridden by setting the filePath property of this class")
 
 		String adminGroup = "ml-gradle Admin"
 		project.task("mlInit", type: InitTask, group: adminGroup, description: "Perform a one-time initialization of a MarkLogic server; uses the properties 'mlLicenseKey' and 'mlLicensee'")