Merge branch '1.0.1'

marklogic · Mar 25, 2016 · 1cb5bee · 1cb5bee
2 parents fba328b + 06840e7
commit 1cb5bee
Show file tree

Hide file tree

Showing 25 changed files with 1,234 additions and 1,083 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# marklogic-jena v1.0.0
+# marklogic-jena v1.0.1
 
 ## Introduction
 
@@ -9,47 +9,19 @@ Framework](http://jena.apache.org) as a persistence and query layer.
 
 #### Setup Marklogic
 
-Ensure MarkLogic 8.0-4 is installed and running.  To use `marklogic-jena`
-applications you will need access to a running MarkLogic server.
-
-## Usage
-
-### Quick start
-
-This API is distributed on Maven Central.
-
-For gradle-based projects, include this dependency in `build.gradle`:
-```
-dependencies {
-   compile 'com.marklogic:marklogic-jena:1.0.0'
-}
-```
-
-For Maven-based projects, use this block in `pom.xml`:
-
-```
-<dependency>
-    <groupId>com.marklogic</groupId>
-    <artifactId>marklogic-jena</artifactId>
-    <version>1.0.0</version>
-</dependency>
-```
-
-The [Javadocs](http://marklogic.github.io/marklogic-jena/marklogic-jena/build/docs/javadoc/)
-have quick start examples for how to do graph CRUD, SPARQL query, and SPARQL
-Update.
+#### Setup Marklogic
 
+Ensure MarkLogic (8.0-4 or later) is installed and running.
 
 ### To use the develop branch
 
-1) Clone or download marklogic-jena _develop_ branch.
+1) clone or download marklogic-jena _develop_ branch.
 
 ```
 https://github.com/marklogic/marklogic-jena/tree/develop
 ```
 
-2) Run the gradle target that provisions a testing database for this project.  The command and tests use values recorded in `./gradle.properties` to
-set up a MarkLogic REST instance on localhost.
+2) Run the gradle target that provisions a testing database for this project.  The command and tests use values recorded in `./gradle.properties`.
 
 ```
 gradle :marklogic-jena:mlDeploy
@@ -68,6 +40,28 @@ To use `marklogic-jena` in your own projects, deploy into local maven repo or co
 gradle install
 
 ```
+
+## Usage
+
+### Quick start (Note: draft for future release)
+
+For gradle-based projects include this dependency in `build.gradle`:
+```
+dependencies {
+   compile 'com.marklogic:marklogic-jena:1.0.0'
+}
+```
+
+Maven-based projects use this block in `pom.xml`:
+
+```
+<dependency>
+    <groupId>com.marklogic</groupId>
+    <artifactId>marklogic-jena</artifactId>
+    <version>1.0.0</version>
+</dependency>
+```
+
 ### Javadocs
 
 http://marklogic.github.io/marklogic-jena/marklogic-jena/build/docs/javadoc/

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,9 @@ subprojects {
 
     apply plugin: 'java'
     apply plugin: 'eclipse'
-
+    apply plugin: 'jacoco'
+    jacoco{toolVersion="0.7.4.201502262128"}
+
     sourceCompatibility = "1.7"
     targetCompatibility = "1.7"
 
@@ -16,10 +18,15 @@ subprojects {
         mavenLocal()
     }
 
+    jacocoTestReport {
+        group = "Reporting"
+        description = "Generate Jacoco coverage reports after running tests."
+        additionalSourceDirs = files(sourceSets.main.allJava.srcDirs)
+    }
 
     dependencies {
-        testCompile group: 'junit', name: 'junit', version: '4.+'
-            testCompile 'org.apache.httpcomponents:httpclient:4.1.1'
+        testCompile group: 'junit', name: 'junit', version: '4.12'
+        testCompile 'org.apache.httpcomponents:httpclient:4.1.1'
     }
 
     test{
@@ -31,6 +38,6 @@ subprojects {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.6'
+    gradleVersion = '2.10'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Sep 04 12:04:45 PDT 2015
+#Tue Jan 12 14:52:40 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip
diff --git a/marklogic-jena/build.gradle b/marklogic-jena/build.gradle
@@ -16,7 +16,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
 
-version = '1.0.0'
+version = '1.0.1'
 group   = 'com.marklogic'
 
 dependencies {
@@ -25,7 +25,7 @@ dependencies {
        exclude(group: 'ch.qos.logback')
        exclude(group: 'log4j')
     }
-    compile('com.marklogic:java-client-api:3.0.4') {
+    compile('com.marklogic:java-client-api:3.0.5') {
 	   exclude(group: 'org.slf4j')
        exclude(group: 'ch.qos.logback')
     }
@@ -108,7 +108,7 @@ publishing {
         asNode().append(pomCustomizations.url)
         asNode().append(pomCustomizations.scm)
         asNode().append(pomCustomizations.licenses)
-        asNode().appendNode("description", pomCustomizations.textdescription.text)
+        asNode().appendNode("description", pomCustomizations.textdescription.text())
       }
 
       artifact sourcesJar 

diff --git a/marklogic-jena/gradle.properties b/marklogic-jena/gradle.properties
@@ -3,6 +3,8 @@ version=1.0.0
 
 publishUrl=file:../marklogic-java/releases
 
+publishUrl=file:../marklogic-java/releases
+
 mlConfigDir=marklogic-jena/src/test/ml-config
 mlHost=localhost
 mlUsername=admin