Merge branch 'dev'

Author: Scott Stafford

build.gradle

@@ -62,8 +62,8 @@ subprojects {
         compile 'ch.qos.logback:logback-classic:1.1.8'
         compile 'org.slf4j:slf4j-api:1.7.21'
         compile "org.springframework.batch:spring-batch-core:$springVersion"
-        compile "com.marklogic:java-client-api:4.0.0-EA3"
-        compile "com.marklogic:ml-javaclient-util:2.11.0"
+        compile "com.marklogic:java-client-api:4.0.0-EA4"
+        compile "com.marklogic:ml-javaclient-util:2.12.0"
 
         testCompile "org.springframework.batch:spring-batch-test:$springVersion"
         testCompile "com.marklogic:ml-junit:2.6.0"
@@ -130,7 +130,7 @@ project(':core') {
         runtime "org.springframework.batch:spring-batch-core:$springVersion"
 
         //com.marklogic.spring.batch.Main extends com.marklogic.client.helper.LoggingObject
-        runtime "com.marklogic:ml-javaclient-util:2.11.0"
+        runtime "com.marklogic:ml-javaclient-util:2.12.0"
 
         runtime "org.springframework:spring-jdbc:4.2.6.RELEASE"
 
@@ -149,7 +149,28 @@ project(':core') {
 project(":infrastructure") {
     description = 'MarkLogic Spring Batch Infrastructure'
     dependencies {
-        compile "com.marklogic:data-movement:1.0.0-EA3"
+        // For importing RDF
+        compile('org.apache.jena:jena-arq:2.13.0') {
+            exclude(group: 'org.slf4j')
+            exclude(group: 'ch.qos.logback')
+            exclude(group: 'log4j')
+        }
+        compile('org.apache.jena:jena-core:2.13.0') {
+            exclude(group: 'org.slf4j')
+            exclude(group: 'xerces')
+            exclude(group: 'commons-cli')
+        }
+        compile('com.hp.hpl.jena:jena:2.6.4') {
+            exclude(group: 'org.slf4j')
+        }
+        compile('com.marklogic:marklogic-jena:1.0.0'){
+            changing=true
+            exclude(group: 'org.slf4j')
+            exclude(group: 'log4j')
+            exclude(group: 'ch.qos.logback')
+        }
+
+        testCompile project(':test')
     }
 
 }

examples/README.md

@@ -0,0 +1,3 @@
+# Examples
+
+This is a playground of former MarkLogic Spring Batch applications that we have built in our discovery of how to use Spring Batch.  The remaining examples are jobs that will either be migrated to standalone projects are kept for archive purposes.