Merge pull request #164 from marklogic-community/feature/java17-testing

Added JAXB test for Java 11 and 17

Author: rjrudin

build.gradle

@@ -2,15 +2,20 @@ plugins {
 	id "java-library"
 	id "maven-publish"
 	id "signing"
-	id "com.github.jk1.dependency-license-report" version "2.1"
 	id "io.snyk.gradle.plugin.snykplugin" version "0.4"
+
+	// This plugin requires Java 11; keeping it commented out so that this project can be built and tested via
+	// Java 8, 11 or 17; to use this plugin, uncomment this line and use java 11 or higher
+	//	id "com.github.jk1.dependency-license-report" version "2.1"
 }
 
 group = "com.marklogic"
 version = "4.3.7"
 
-sourceCompatibility = "8"
-targetCompatibility = "8"
+java {
+	sourceCompatibility = 1.8
+	targetCompatibility = 1.8
+}
 
 repositories {
 	mavenCentral()
@@ -37,9 +42,18 @@ dependencies {
   testImplementation files("lib/modules.jar")
 
 	// Forcing Spring to use logback instead of commons-logging
-	testImplementation "ch.qos.logback:logback-classic:1.4.5"
+	testImplementation "ch.qos.logback:logback-classic:1.3.5" // 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"
+
+	// 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-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.1"
 }
 
 test {

pom.xml

@@ -40,19 +40,19 @@ It is not intended to be used to build this project.
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-client-api</artifactId>
-      <version>5.5.3</version>
+      <version>5.5.4</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.marklogic</groupId>
       <artifactId>marklogic-xcc</artifactId>
-      <version>10.0.9</version>
+      <version>10.0.9.5</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
-      <version>5.3.22</version>
+      <version>5.3.24</version>
       <scope>compile</scope>
     </dependency>
     <dependency>

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

@@ -0,0 +1,60 @@
+package com.marklogic.client.ext.jaxb;
+
+import com.marklogic.client.io.JAXBHandle;
+import org.junit.jupiter.api.Test;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class JAXBHandleTest {
+
+	/**
+	 * Included solely to verify that when the test is run using Java 11 or Java 17, it will succeed given that the
+	 * testImplementation configuration in Gradle imports the necessary "old" JAXB libraries.
+	 *
+	 * @throws JAXBException
+	 */
+	@Test
+	void simpleTest() throws JAXBException {
+		JAXBHandle handle = new JAXBHandle(JAXBContext.newInstance(Product.class));
+		Product p = new Product();
+		p.setName("My name");
+		p.setIndustry("My industry");
+		handle.set(p);
+		String xml = handle.toString();
+
+		Product p2 = (Product) handle.bytesToContent(xml.getBytes());
+		assertEquals("My name", p2.getName());
+		assertEquals("My industry", p2.getIndustry());
+	}
+
+	@XmlRootElement
+	static public class Product {
+		private String name;
+		private String industry;
+
+		public Product() {
+			super();
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getIndustry() {
+			return industry;
+		}
+
+		public void setIndustry(String industry) {
+			this.industry = industry;
+		}
+	}
+
+}