Merge branch 'releases/v3.0.6'

marklogic · Oct 15, 2018 · c083f5c · c083f5c
2 parents c0859cb + a31b474
commit c083f5c
Show file tree

Hide file tree

Showing 41 changed files with 2,211 additions and 5,006 deletions.
diff --git a/LEGALNOTICES.txt b/LEGALNOTICES.txt
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# marklogic-jena v3.0.5
+# marklogic-jena v3.0.6
 
 ## 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.5'
+   compile 'com.marklogic:marklogic-jena:3.0.6'
 }
 ```
 
@@ -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.5</version>
+    <version>3.0.6</version>
 </dependency>
 ```
 
@@ -83,7 +83,7 @@ promise a specific resolution or timeframe for any request.
 
 In addition, MarkLogic provides technical support for [release
 tags](https://github.com/marklogic/marklogic-jena/releases) of `marklogic-jena`
-licensed customers under the terms outlined in the [Support
+to licensed customers under the terms outlined in the [Support
 Handbook](http://www.marklogic.com/files/Mark_Logic_Support_Handbook.pdf). For
 more information or to sign up for support, visit
 [help.marklogic.com](http://help.marklogic.com).
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.marklogic.ml-gradle" version "3.0.0"
+    id "com.marklogic.ml-gradle" version "3.9.0"
 }
 
 subprojects {

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,4 +1,3 @@
-#Fri Nov 03 10:38:07 PDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
@@ -49,7 +49,6 @@ goto fail
 @rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

diff --git a/marklogic-jena-examples/gradle.properties b/marklogic-jena-examples/gradle.properties
@@ -1,5 +1,5 @@
 group=com.marklogic
-version=3.0.5
+version=3.0.6
 
 mlConfigDir=marklogic-jena-examples/src/main/ml-config
 mlHost=localhost

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ExampleUtils.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ExampleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/GraphCRUDExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/GraphCRUDExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ModelCRUDExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ModelCRUDExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/NaiveBenchmarkExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/NaiveBenchmarkExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/RIOTExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/RIOTExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 MarkLogic Corporation
+ * Copyright 2015-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLQueryExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLQueryExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLUpdateExample.java b/marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLUpdateExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ena-functionaltests/src/test/java/com/marklogic/jena/functionaltests/ConnectedRESTQA.java b/...ena-functionaltests/src/test/java/com/marklogic/jena/functionaltests/ConnectedRESTQA.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 MarkLogic Corporation
+ * Copyright 2014-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...jena-functionaltests/src/test/java/com/marklogic/jena/functionaltests/JenaGraphTests.java b/...jena-functionaltests/src/test/java/com/marklogic/jena/functionaltests/JenaGraphTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 MarkLogic Corporation
+ * Copyright 2015-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...nctionaltests/src/test/java/com/marklogic/jena/functionaltests/JenaSPARQLUpdateTests.java b/...nctionaltests/src/test/java/com/marklogic/jena/functionaltests/JenaSPARQLUpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2017 MarkLogic Corporation
+ * Copyright 2015-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/build.gradle b/marklogic-jena/build.gradle
@@ -6,12 +6,12 @@ apply plugin: 'maven-publish'
 apply plugin: 'maven'
 
 
-version = '3.0.5'
+version = '3.0.6'
 group   = 'com.marklogic'
 
 dependencies {
     compile('org.apache.jena:jena-arq:3.4.0')
-    compile('com.marklogic:marklogic-client-api:4.0.3')
+    compile('com.marklogic:marklogic-client-api:4.1.1')
 
     compile("org.slf4j:slf4j-api:$slf4jVersion")
     compile "ch.qos.logback:logback-classic:$logbackVersion"
@@ -101,6 +101,12 @@ publishing {
   }
   repositories {
     maven {
+      if ( project.hasProperty("mavenUser")) { 
+        credentials {
+          username mavenUser
+          password mavenPassword
+        }
+      }
       url publishUrl
     }
   }

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

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicDatasetGraph.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicDatasetGraph.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicDatasetGraphFactory.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicDatasetGraphFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicJenaException.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicJenaException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicTransactionException.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/MarkLogicTransactionException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/JenaDatabaseClient.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/JenaDatabaseClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/OutputStreamRIOTSender.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/OutputStreamRIOTSender.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/QuadsIterator.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/QuadsIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TripleBuffer.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TripleBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TriplesDeleteBuffer.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TriplesDeleteBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TriplesWriteBuffer.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/TriplesWriteBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/WrappingIterator.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/WrappingIterator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/package-info.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/client/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/MarkLogicQueryEngine.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/MarkLogicQueryEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/MarkLogicUpdateEngine.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/MarkLogicUpdateEngine.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/package-info.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/engine/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 the Apache License, Version 2.0 (the "License");
+ * Copyright 2016-2018 the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *

diff --git a/marklogic-jena/src/main/java/com/marklogic/semantics/jena/package-info.java b/marklogic-jena/src/main/java/com/marklogic/semantics/jena/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/test/java/com/marklogic/semantics/jena/JenaTestBase.java b/marklogic-jena/src/test/java/com/marklogic/semantics/jena/JenaTestBase.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/test/java/com/marklogic/semantics/jena/MarkLogicDatasetGraphTest.java b/marklogic-jena/src/test/java/com/marklogic/semantics/jena/MarkLogicDatasetGraphTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicCombinationQueryTest.java b/...jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicCombinationQueryTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ogic-jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicQueryEngineTest.java b/...ogic-jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicQueryEngineTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/marklogic-jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicUpdatesTest.java b/marklogic-jena/src/test/java/com/marklogic/semantics/jena/engine/MarkLogicUpdatesTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2017 MarkLogic Corporation
+ * Copyright 2016-2018 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.