Merge branch 'release-3.0.5'

marklogic · Dec 5, 2017 · c0859cb · c0859cb
2 parents c53f942 + 052cda7
commit c0859cb
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# marklogic-jena v3.0.3
+# marklogic-jena v3.0.5
 
 ## Introduction
 
@@ -46,7 +46,7 @@ gradle install
 For gradle-based projects include this dependency in `build.gradle`:
 ```
 dependencies {
-   compile 'com.marklogic:marklogic-jena:3.0.3'
+   compile 'com.marklogic:marklogic-jena:3.0.5'
 }
 ```
 
@@ -56,7 +56,7 @@ Maven-based projects use this block in `pom.xml`:
 <dependency>
     <groupId>com.marklogic</groupId>
     <artifactId>marklogic-jena</artifactId>
-    <version>3.0.3</version>
+    <version>3.0.5</version>
 </dependency>
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.marklogic.ml-gradle" version "2.5.0"
+    id "com.marklogic.ml-gradle" version "3.0.0"
 }
 
 subprojects {
@@ -10,8 +10,8 @@ subprojects {
     jacoco{toolVersion="0.7.4.201502262128"}
 
     configure(allprojects){
-        ext.slf4jVersion = '1.7.21'
-        ext.logbackVersion = '1.1.7'
+        ext.slf4jVersion = '1.7.25'
+        ext.logbackVersion = '1.2.3'
     }
 
     repositories {
@@ -28,7 +28,7 @@ subprojects {
 
     dependencies {
         testCompile group: 'junit', name: 'junit', version: '4.12'
-        testCompile 'org.apache.httpcomponents:httpclient:4.5.2'
+        testCompile 'org.apache.httpcomponents:httpclient:4.5.3'
     }
 
     test{
@@ -40,6 +40,6 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.14'
+    gradleVersion = '4.3'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 15 13:31:12 PDT 2017
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-all.zip
+#Fri Nov 03 10:38:07 PDT 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip
diff --git a/marklogic-jena-examples/gradle.properties b/marklogic-jena-examples/gradle.properties
@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.0.4
+version=3.0.5
 
 mlConfigDir=marklogic-jena-examples/src/main/ml-config
 mlHost=localhost

diff --git a/marklogic-jena/build.gradle b/marklogic-jena/build.gradle
@@ -6,27 +6,27 @@ apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
 
-version = '3.0.4'
+version = '3.0.5'
 group   = 'com.marklogic'
 
 dependencies {
-    compile('org.apache.jena:jena-arq:3.2.0')
-    compile('com.marklogic:marklogic-client-api:4.0.2')
+    compile('org.apache.jena:jena-arq:3.4.0')
+    compile('com.marklogic:marklogic-client-api:4.0.3')
 
-	compile("org.slf4j:slf4j-api:$slf4jVersion")
-	compile "ch.qos.logback:logback-classic:$logbackVersion"
-	compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+    compile("org.slf4j:slf4j-api:$slf4jVersion")
+    compile "ch.qos.logback:logback-classic:$logbackVersion"
+    compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
 
-	testCompile 'com.jayway.restassured:rest-assured:2.9.0'
-	testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile 'com.jayway.restassured:rest-assured:2.9.0'
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
 }
 
 sourceSets {
-	test {
-		java {
-			srcDir 'src/test/resources'
-		}
-	}
+    test {
+        java {
+            srcDir 'src/test/resources'
+        }
+    }
 }
 
 task javadocJar(type: Jar, dependsOn: javadoc) {

diff --git a/marklogic-jena/gradle.properties b/marklogic-jena/gradle.properties
@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.0.4
+version=3.0.5
 
 publishUrl=file:../marklogic-java/releases