Merge branch 'develop'

.editorconfig

@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.java]
+indent_size = 4

README.md

@@ -22,20 +22,20 @@ 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`.
 
 ```
-gradle :marklogic-jena:mlDeploy
+./gradlew :marklogic-jena:mlDeploy
 ```
 
 3) Build MarkLogic Jena.
 
 ```
-gradle :marklogic-jena:test
+./gradlew :marklogic-jena:test
 
 ```
 
 To use `marklogic-jena` in your own projects, deploy into local maven repo or copy snapshot jars from /build directory.
 
 ```
-gradle install
+./gradlew publishToMavenLocal
 
 ```
 
@@ -46,7 +46,7 @@ gradle install
 For gradle-based projects include this dependency in `build.gradle`:
 ```
 dependencies {
-   compile 'com.marklogic:marklogic-jena:3.0.6'
+   implementation 'com.marklogic:marklogic-jena:4.0.0'
 }
 ```
 
@@ -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.6</version>
+    <version>4.0.0</version>
 </dependency>
 ```
 

build.gradle

@@ -1,45 +1,30 @@
 plugins {
-    id "com.marklogic.ml-gradle" version "3.9.0"
+    id "com.marklogic.ml-gradle" version "4.3.5"
 }
 
 subprojects {
 
     apply plugin: 'java'
-    apply plugin: 'eclipse'
     apply plugin: 'jacoco'
-    jacoco{toolVersion="0.7.4.201502262128"}
-
-    configure(allprojects){
-        ext.slf4jVersion = '1.7.25'
-        ext.logbackVersion = '1.2.3'
-    }
+    jacoco{toolVersion="0.8.4"}
 
     repositories {
         mavenCentral()
-        mavenLocal()
-        jcenter()
     }
 
     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.12'
-        testCompile 'org.apache.httpcomponents:httpclient:4.5.3'
+        testImplementation 'junit:junit:4.13.2'
+        testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
     }
 
-    test{
-        testLogging{
-            events 'started','passed', 'skipped'
+    test {
+        testLogging {
+            events 'started', 'passed', 'skipped'
         }
     }
-
 }
-
-task wrapper(type: Wrapper) {
-    gradleVersion = '4.3'
-}
-

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ 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
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

marklogic-jena-examples/build.gradle

@@ -1,41 +1,38 @@
 plugins {
-    id 'me.champeau.gradle.jmh' version '0.1.3'
+  id 'me.champeau.gradle.jmh' version '0.5.3'
 }
 
 apply plugin: 'me.champeau.gradle.jmh'
 apply plugin: 'com.marklogic.ml-gradle'
-apply plugin: 'eclipse'
 apply plugin: 'java'
 
-
-
 dependencies {
-  compile project (':marklogic-jena')
-  compile 'org.openjdk.jmh:jmh-core:1.3.2'
-  compile 'org.openjdk.jmh:jmh-generator-annprocess:1.3.2'
+  implementation project(':marklogic-jena')
+  implementation 'org.openjdk.jmh:jmh-core:1.35'
+  implementation 'org.openjdk.jmh:jmh-generator-annprocess:1.35'
 }
 
 task runGraphExample(type: JavaExec) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'com.marklogic.jena.examples.GraphCRUDExample'
+  classpath = sourceSets.main.runtimeClasspath
+  main = 'com.marklogic.jena.examples.GraphCRUDExample'
 }
 
 task runModelExample(type: JavaExec) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'com.marklogic.jena.examples.ModelCRUDExample'
+  classpath = sourceSets.main.runtimeClasspath
+  main = 'com.marklogic.jena.examples.ModelCRUDExample'
 }
 
 task runRIOTExample(type: JavaExec) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'com.marklogic.jena.examples.RIOTExample'
+  classpath = sourceSets.main.runtimeClasspath
+  main = 'com.marklogic.jena.examples.RIOTExample'
 }
 
 task runQueryExample(type: JavaExec) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'com.marklogic.jena.examples.SPARQLQueryExample'
+  classpath = sourceSets.main.runtimeClasspath
+  main = 'com.marklogic.jena.examples.SPARQLQueryExample'
 }
 
 task runUpdateExample(type: JavaExec) {
-    classpath = sourceSets.main.runtimeClasspath
-    main = 'com.marklogic.jena.examples.SPARQLUpdateExample'
+  classpath = sourceSets.main.runtimeClasspath
+  main = 'com.marklogic.jena.examples.SPARQLUpdateExample'
 }

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ExampleUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/GraphCRUDExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/ModelCRUDExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/NaiveBenchmarkExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/RIOTExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2018 MarkLogic Corporation
+ * Copyright 2015-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLQueryExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-examples/src/main/java/com/marklogic/jena/examples/SPARQLUpdateExample.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018 MarkLogic Corporation
+ * Copyright 2016-2019 MarkLogic Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

marklogic-jena-functionaltests/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-compile project (':marklogic-jena')
-compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.1'
-compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.1'
-}
+  implementation project(':marklogic-jena')
+  implementation 'org.apache.logging.log4j:log4j-api:2.18.0'
+  implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
+}