Merge pull request #204 from BillFarber/dev

Merge in 4.8.0 changes

Author: BillFarber

CONTRIBUTING.md

@@ -3,7 +3,7 @@ the following steps:
 
 1. Create a file named `gradle-local.properties`.
 2. Add `mlPassword=` followed by the password for your MarkLogic admin user.
-3. Verify that port 8070 is available on your computer - i.e. no other process is listening on it.
+3. Verify that port 8028 is available on your computer - i.e. no other process is listening on it.
 4. Run `./gradlew -i mlDeploy`.
 
 You can then run `./gradlew -i test` to run all of the tests.

Jenkinsfile

@@ -6,7 +6,7 @@ pipeline{
     buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '30', numToKeepStr: '')
   }
   environment{
-    JAVA_HOME_DIR="/home/builder/java/jdk-11.0.2"
+    JAVA_HOME_DIR="/home/builder/java/openjdk-1.8.0-262"
     GRADLE_DIR   =".gradle"
     DMC_USER     = credentials('MLBUILD_USER')
     DMC_PASSWORD = credentials('MLBUILD_PASSWORD')

build.gradle

@@ -10,11 +10,11 @@ plugins {
 
 	// For deploying the test app.
 	id 'net.saliman.properties' version '1.5.2'
-	id "com.marklogic.ml-gradle" version "4.6.1"
+	id "com.marklogic.ml-gradle" version "4.7.0"
 }
 
 group = "com.marklogic"
-version = "4.7.0"
+version = "4.8.0"
 
 java {
 	sourceCompatibility = 1.8
@@ -30,38 +30,38 @@ repositories {
 }
 
 dependencies {
-	api 'com.marklogic:marklogic-client-api:6.5.0'
-	api 'com.marklogic:marklogic-xcc:11.1.0'
-	api 'org.springframework:spring-context:5.3.31'
+	api 'com.marklogic:marklogic-client-api:6.6.0'
+	api 'com.marklogic:marklogic-xcc:11.2.0'
+	api 'org.springframework:spring-context:5.3.34'
 
 	implementation 'org.jdom:jdom2:2.0.6.1'
 
 	implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
 
 	// This is currently an implementation dependency, though perhaps should be an api dependency due to its usage in
 	// LoggingObject; not clear yet on whether the protected Logger in that class should make this an api dependency or not
-	implementation 'org.slf4j:slf4j-api:1.7.36'
+	implementation 'org.slf4j:slf4j-api:2.0.13'
 
-	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'
-	testImplementation 'org.springframework:spring-test:5.3.31'
+	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
+	testImplementation 'org.springframework:spring-test:5.3.34'
 	testImplementation 'org.mockito:mockito-core:4.11.0'
 
 	// Used for testing loading modules from the classpath
 	testImplementation files("lib/modules.jar")
 
 	// Forcing Spring to use logback instead of commons-logging
 	testImplementation "ch.qos.logback:logback-classic:1.3.14" // Not using 1.4.x yet as it requires Java 11
-	testImplementation "org.slf4j:jcl-over-slf4j:1.7.36"
-	testImplementation "org.slf4j:slf4j-api:1.7.36"
+	testImplementation "org.slf4j:jcl-over-slf4j:2.0.13"
+	testImplementation "org.slf4j:slf4j-api:2.0.13"
 
 	// For verifying that JAXB can be used in a test on Java 11 or higher
 	testImplementation "javax.xml.bind:jaxb-api:2.3.1"
-	testImplementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
+	testImplementation "org.glassfish.jaxb:jaxb-runtime:2.3.9"
 	testImplementation "org.glassfish.jaxb:jaxb-core:2.3.0.1"
 
 	// Including the "new" JAXB libraries to verify that their presence doesn't cause the "old" JAXB libraries to fail
-	testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
-	testImplementation "com.sun.xml.bind:jaxb-impl:4.0.3"
+	testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.2"
+	testImplementation "com.sun.xml.bind:jaxb-impl:4.0.5"
 }
 
 test {

pom.xml

@@ -12,7 +12,7 @@ It is not intended to be used to build this project.
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.marklogic</groupId>
   <artifactId>ml-javaclient-util</artifactId>
-  <version>4.6.0</version>
+  <version>4.8.0</version>
   <name>com.marklogic:ml-javaclient-util</name>
   <description>Library that adds functionality on top of the MarkLogic Java Client</description>
   <url>https://github.com/marklogic/ml-javaclient-util</url>

src/test/java/com/marklogic/client/ext/jaxb/JAXBHandleTest.java

@@ -17,6 +17,8 @@
 
 import com.marklogic.client.io.JAXBHandle;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
@@ -33,6 +35,7 @@ public class JAXBHandleTest {
 	 * @throws JAXBException
 	 */
 	@Test
+	@EnabledForJreRange(min = JRE.JAVA_11)
 	void simpleTest() throws JAXBException {
 		JAXBHandle handle = new JAXBHandle(JAXBContext.newInstance(Product.class));
 		Product p = new Product();