Merge branch 'dev'

Author: Scott Stafford

CONTRIBUTING.md

@@ -53,18 +53,30 @@ The gradlew (or gradlew.bat on Windows) command is a Java program called the [Gr
 
 Check the following properties file to see if there is any conflicts with your existing system.
 
-    $PROJET_ROOT/core/gradle.properties
+    $PROJECT_ROOT/core/gradle.properties
+
+The gradle.properties file indicates where to deploy a test database to test the core unit test.  The job.properties are used for testing the examples.  
 
 From the project root, run the following command.  This will create a test database that is configured as a MarkLogic Job Repository.  
 
     gradlew :core:mlDeploy
 
-Run the automated unit tests from the project root
+## Set your environment variables for running the examples
+
+Every example under the examples project relies on a properties file called job.properties that indicates the connection information for your MarkLogic database.  The default job.properties can be found for the project in the following location. 
+
+    $PROJECT_ROOT/examples/job.properties
+
+The directory location for the job.properties is indicated in the environment variable _job.home_.  Make sure that this environment variable (job.home) is set before running any of the example tests.  
+
+To execute all of the automated unit tests, from the project root, run the following command.  
 
 ```
 gradlew test
 ```
 
+This will execute all the core and examples testing.  
+
 The policy is the dev branch tests are 100% passing.  If all tests run to completion and 100% passing then you are ready to start commiting code.    
 
 # What should I work on?

build.gradle

@@ -1,3 +1,4 @@
+
 subprojects {
     /*
      * Not applying the bintray plugin. Couldn't get it working properly when declared
@@ -67,6 +68,17 @@ subprojects {
 }
 
 project(':core') {
+    dependencies {
+        runtime "org.springframework.batch:spring-batch-core:3.0.7.RELEASE"
+
+        //com.marklogic.spring.batch.Main extends com.marklogic.client.helper.LoggingObject
+        runtime "com.marklogic:ml-javaclient-util:2.10.0-alpha"
+
+        runtime "org.springframework:spring-jdbc:4.2.6.RELEASE"
+
+        runtime "net.sf.jopt-simple:jopt-simple:5.0.1"
+    }
+
     task testExamples(type: GradleBuild) {
         buildFile = '../examples/build.gradle'
         tasks = [ 'test' ]

core/build.gradle

@@ -19,15 +19,6 @@ dependencies {
 
     testCompile "com.marklogic:ml-junit:2.6.0"
 
-    runtime "org.springframework.batch:spring-batch-core:3.0.7.RELEASE"
-
-    //com.marklogic.spring.batch.Main extends com.marklogic.client.helper.LoggingObject
-    runtime "com.marklogic:ml-javaclient-util:2.10.0-alpha"
-
-    //Main depends on joptsimple.OptionParser;
-    runtime "net.sf.jopt-simple:jopt-simple:5.0.1"
-
-    runtime "org.springframework:spring-jdbc:4.2.6.RELEASE"
 }
 
 jar {

examples/base/build.gradle

@@ -1,25 +1,21 @@
 /*
-This base gradle file imports the latest MarkLogic Spring Batch Core and Test libraries that are published to jCenter.
+This base gradle file imports the latest MarkLogic Spring Batch Core and Test libraries that are published to jCenter.  Make sure that the job.home environment variable is set.
  */
 
 plugins {
     id "java"
     id "application"
 }
 
-test {
-    systemProperty "job.home", examplesDir
-}
-
 repositories {
     jcenter()
     mavenLocal()
 }
 
 dependencies {
-    compile "com.marklogic:marklogic-spring-batch-core:0.7.1"
+    compile "com.marklogic:marklogic-spring-batch-core:0.7.2"
     compile "com.marklogic:ml-javaclient-util:2.9.1"
-    testCompile "com.marklogic:marklogic-spring-batch-test:0.7.1"
+    testCompile "com.marklogic:marklogic-spring-batch-test:0.7.2"
 }
 
 distributions {

examples/base/gradle.properties

@@ -0,0 +1 @@
+job.home=../

examples/base/runBaseJob.bat

@@ -0,0 +1,4 @@
+build\install\baseJob\bin\base.bat ^
+  --host oscar --port 8200 --username admin --password admin ^
+  --config example.YourJobConfig ^
+  --output_collections yourJob

examples/build.gradle

@@ -2,19 +2,21 @@ subprojects {
     apply plugin: "java"
     apply plugin: "application"
 
+/*
+// The job.home environment variable is assumed to be predefined.  Otherwise, you can uncomment this section and set the examplesDir variable in the gradle.properties file.
     test {
         systemProperty "job.home", examplesDir
     }
-
+*/
     repositories {
         jcenter()
         maven { url "http://developer.marklogic.com/maven2" }
         mavenLocal()
     }
 
     dependencies {
-        compile "com.marklogic:marklogic-spring-batch-core:0.7.1"
-        testCompile "com.marklogic:marklogic-spring-batch-test:0.7.1"
+        compile "com.marklogic:marklogic-spring-batch-core:0.7.2"
+        testCompile "com.marklogic:marklogic-spring-batch-test:0.7.2"
     }
 
     mainClassName = "com.marklogic.spring.batch.Main"

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=0.7.1
+version=0.7.2
 
 # Subprojects must override this so that publishing works properly
 # This is used instead of project.name, which cannot be overridden