MLE-15728 Now depending on Jakarta JAXB

Will update the README later with instructions on how to force the client to use Jakarta 4.x instead of Jakarta 3.x. 

No real functional changes here, just changing from `javax.xml` to `jakarta.xml`. But it's a breaking change due to JAXB APIs being present in the public API of classes like `JAXBHandle`.

Author: rjrudin

README.md

@@ -51,61 +51,7 @@ Full documentation is available at:
 
 ## Including JAXB support 
 
-If you are using Java 11 or higher (including Java 17) and you wish to use [JAXB](https://docs.oracle.com/javase/tutorial/jaxb/intro/)
-with the client, you'll need to include JAXB API and implementation dependencies as those are no 
-longer included in Java 11 and higher.
-
-For Maven, include the following in your pom.xml file:
-
-    <dependency>
-        <groupId>javax.xml.bind</groupId>
-        <artifactId>jaxb-api</artifactId>
-        <version>2.3.1</version>
-    </dependency>
-    <dependency>
-        <groupId>org.glassfish.jaxb</groupId>
-        <artifactId>jaxb-runtime</artifactId>
-        <version>2.3.2</version>
-    </dependency>
-    <dependency>
-        <groupId>org.glassfish.jaxb</groupId>
-        <artifactId>jaxb-core</artifactId>
-        <version>2.3.0.1</version>
-    </dependency>
-
-For Gradle, include the following in your build.gradle file (this can be included in the same `dependencies` block 
-as the one that includes the marklogic-client-api dependency):
-
-    dependencies {
-        implementation "javax.xml.bind:jaxb-api:2.3.1"
-        implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
-        implementation "org.glassfish.jaxb:jaxb-core:2.3.0.1"
-    }
-
-You are free to use any implementation of JAXB that you wish, but you need to ensure that you're using a JAXB 
-implementation that corresponds to the `javax.xml.bind` interfaces. JAXB 3.0 and 4.0 interfaces are packaged under 
-`jakarta.xml.bind`, and the Java API does not yet depend on those interfaces. 
-
-Thus, you are free to include an implementation of JAXB 3.0 or 4.0 in your project for your own use; it will not 
-affect the Java API. A caveat though is if you are trying to use different major versions of the same JAXB 
-implementation library - such as `org.glassfish.jaxb:jaxb-runtime` - then you will run into an expected dependency 
-conflict between the two versions of the library. This can be worked around by using a different implementation of 
-JAXB 3.0 or JAXB 4.0 - for example:
-
-    dependencies {
-        // JAXB 2 dependencies required by Java Client
-        implementation "javax.xml.bind:jaxb-api:2.3.1"
-        implementation "org.glassfish.jaxb:jaxb-runtime:2.3.2"
-        implementation "org.glassfish.jaxb:jaxb-core:2.3.0.1"
-        
-        // JAXB 4 dependencies required by other application code
-        implementation "jakarta.xml.bind:jakarta.xml.bind-api:4.0.0"
-        implementation "com.sun.xml.bind:jaxb-impl:4.0.1"
-    }
-
-The client will soon be updated to use the newer `jakarta.xml.bind` interfaces. Until then, the above approach
-or one similar to it will allow for both the old and new JAXB interfaces and implementations to exist together in the
-same classpath.
+TODO, Need to rewrite this for Java Client 7.0.0.
 
 ## Support
 

examples/build.gradle

@@ -5,11 +5,6 @@ plugins {
 }
 
 dependencies {
-	if (JavaVersion.current().isJava9Compatible()) {
-		implementation 'javax.xml.bind:jaxb-api:2.3.1'
-		implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
-		implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1'
-	}
 	implementation project(':marklogic-client-api')
 
 	// Forcing usage of 3.4.0 instead of 3.2.0 to address vulnerability - https://security.snyk.io/vuln/SNYK-JAVA-COMSQUAREUPOKIO-5820002

examples/src/main/java/com/marklogic/client/example/cookbook/AllCookbookExamples.java

@@ -17,7 +17,7 @@
 
 import java.io.IOException;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.xpath.XPathExpressionException;
 
 import com.marklogic.client.FailedRequestException;

examples/src/main/java/com/marklogic/client/example/cookbook/JAXBDocument.java

@@ -17,9 +17,9 @@
 
 import java.io.IOException;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;

examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/DatabaseClientSingleton.java

@@ -19,7 +19,7 @@
 import java.text.SimpleDateFormat;
 import java.util.HashMap;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.DatabaseClientFactory;

examples/src/main/java/com/marklogic/client/example/cookbook/datamovement/WriteandReadPOJOs.java

@@ -15,8 +15,8 @@
  */
 package com.marklogic.client.example.cookbook.datamovement;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -53,7 +53,7 @@ public static void main(String args[]) throws JAXBException {
 
   /**
    * A sample class which we will be using in order to demonstrate
-   * reading and writing large number of POJOs 
+   * reading and writing large number of POJOs
    */
   @XmlRootElement
   public static class ProductDetails {
@@ -136,7 +136,7 @@ public void readBulkPOJOS() throws JAXBException {
     // Create a query definition in order to use it with QueryBatcher
     StructuredQueryDefinition query = new StructuredQueryBuilder().collection("products-collection1");
 
-    // Create a QueryBatcher in order to retrieve bulk POJOs 
+    // Create a QueryBatcher in order to retrieve bulk POJOs
     // from the database matching the query definition
     QueryBatcher queryBatcher = moveMgr.newQueryBatcher(query)
       .withBatchSize(batchSize)

gradle.properties

@@ -1,5 +1,5 @@
 group=com.marklogic
-version=6.7-SNAPSHOT
+version=7.0-SNAPSHOT
 describedName=MarkLogic Java Client API
 publishUrl=file:../marklogic-java/releases
 

marklogic-client-api-functionaltests/build.gradle

@@ -27,13 +27,7 @@ dependencies {
   implementation 'com.fasterxml.jackson.core:jackson-core:2.15.3'
   implementation 'com.fasterxml.jackson.core:jackson-databind:2.15.3'
   implementation "org.jdom:jdom2:2.0.6.1"
-  implementation "com.marklogic:ml-app-deployer:4.6.1"
-
-	if (JavaVersion.current().isJava9Compatible()) {
-		implementation 'javax.xml.bind:jaxb-api:2.3.1'
-		implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.8'
-		implementation 'org.glassfish.jaxb:jaxb-core:2.3.0.1'
-	}
+  implementation "com.marklogic:ml-app-deployer:4.7.0"
 
   testImplementation 'ch.qos.logback:logback-classic:1.3.14'
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.10.1'

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestBulkWriteSample1.java

@@ -29,7 +29,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import javax.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBContext;
 import javax.xml.transform.Source;
 import javax.xml.transform.dom.DOMSource;
 import java.io.*;

marklogic-client-api-functionaltests/src/test/java/com/marklogic/client/fastfunctest/TestMetadata.java

@@ -34,7 +34,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import javax.xml.namespace.QName;
 import java.io.File;
 import java.io.FileInputStream;