Merge pull request #3643 from adamretter/hotfix/jaxb-deps-jdk11

Fix compilation issue with JAXB dependencies on JDK 11+

Author: dizzzz

exist-core/pom.xml

@@ -173,14 +173,13 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
 
-        <!-- needed on JDK 10+ -->
         <dependency>
-            <groupId>org.glassfish.jaxb</groupId>
-            <artifactId>jaxb-runtime</artifactId>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
             <scope>runtime</scope>
         </dependency>
 

exist-core/src/main/java/org/exist/http/jaxb/Collection.java

@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// This file was generated by the Eclipse Implementation of JAXB, v3.0.0 
+// See https://eclipse-ee4j.github.io/jaxb-ri 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.12.01 at 08:56:54 PM GMT 
+// Generated on: 2020.12.01 at 10:16:19 AM CET 
 //
 
 /*
@@ -30,19 +30,19 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
- * Java class for anonymous complex type.
+ * <p>Java class for anonymous complex type.
  * 
- * The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType&gt;
@@ -56,6 +56,8 @@
  *   &lt;/complexContent&gt;
  * &lt;/complexType&gt;
  * </pre>
+ * 
+ * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "", propOrder = {
@@ -80,28 +82,28 @@ public class Collection {
     /**
      * Gets the value of the collection property.
      * 
-     *
+     * <p>
      * This accessor method returns a reference to the live list,
      * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
+     * returned list will be present inside the Jakarta XML Binding object.
      * This is why there is not a <CODE>set</CODE> method for the collection property.
      * 
-     *
+     * <p>
      * For example, to add a new item, do as follows:
      * <pre>
      *    getCollection().add(newItem);
      * </pre>
      * 
      * 
-     *
+     * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link Collection }
      * 
-     * @return the collections.
+     * 
      */
     public List<Collection> getCollection() {
         if (collection == null) {
-            collection = new ArrayList<>();
+            collection = new ArrayList<Collection>();
         }
         return this.collection;
     }

exist-core/src/main/java/org/exist/http/jaxb/ObjectFactory.java

@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// This file was generated by the Eclipse Implementation of JAXB, v3.0.0 
+// See https://eclipse-ee4j.github.io/jaxb-ri 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.12.01 at 08:56:54 PM GMT 
+// Generated on: 2020.12.01 at 10:16:19 AM CET 
 //
 
 /*
@@ -28,14 +28,14 @@
  */
 package org.exist.http.jaxb;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
  * generated in the org.exist.http.jaxb package. 
- * An ObjectFactory allows you to programatically
+ * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
  * content can consist of schema derived interfaces 
@@ -48,100 +48,97 @@
 @XmlRegistry
 public class ObjectFactory {
 
+
     /**
-     * Create an instance of {@link Result }
-     *
-     * @return the result
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.exist.http.jaxb
+     * 
      */
-    public Result createResult() {
-        return new Result();
+    public ObjectFactory() {
     }
 
     /**
      * Create an instance of {@link Query }
-     *
-     * @return the query
+     * 
      */
     public Query createQuery() {
         return new Query();
     }
 
+    /**
+     * Create an instance of {@link Result }
+     * 
+     */
+    public Result createResult() {
+        return new Result();
+    }
+
     /**
      * Create an instance of {@link Sequence }
-     *
-     * @return the sequence
+     * 
      */
     public Sequence createSequence() {
         return new Sequence();
     }
 
     /**
      * Create an instance of {@link Query.Properties }
-     *
-     * @return the query properties
+     * 
      */
     public Query.Properties createQueryProperties() {
         return new Query.Properties();
     }
 
     /**
      * Create an instance of {@link Query.Variables }
-     *
-     * @return the query variables
+     * 
      */
     public Query.Variables createQueryVariables() {
         return new Query.Variables();
     }
 
     /**
      * Create an instance of {@link Query.Variables.Variable }
-     *
-     * @return the variable
+     * 
      */
     public Query.Variables.Variable createQueryVariablesVariable() {
         return new Query.Variables.Variable();
     }
 
     /**
      * Create an instance of {@link Collection }
-     *
-     * @return the collection
+     * 
      */
     public Collection createCollection() {
         return new Collection();
     }
 
     /**
      * Create an instance of {@link Result.Value }
-     *
-     * @return the result value
+     * 
      */
     public Result.Value createResultValue() {
         return new Result.Value();
     }
 
     /**
      * Create an instance of {@link Sequence.Value }
-     *
-     * @return the sequence value
+     * 
      */
     public Sequence.Value createSequenceValue() {
         return new Sequence.Value();
     }
 
     /**
      * Create an instance of {@link Query.Properties.Property }
-     *
-     * @return the property
+     * 
      */
     public Query.Properties.Property createQueryPropertiesProperty() {
         return new Query.Properties.Property();
     }
 
     /**
      * Create an instance of {@link Query.Variables.Variable.Qname }
-     *
-     * @return the qname
+     * 
      */
     public Query.Variables.Variable.Qname createQueryVariablesVariableQname() {
         return new Query.Variables.Variable.Qname();

exist-core/src/main/java/org/exist/http/jaxb/Query.java

@@ -1,8 +1,8 @@
 //
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// This file was generated by the Eclipse Implementation of JAXB, v3.0.0 
+// See https://eclipse-ee4j.github.io/jaxb-ri 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2017.12.01 at 08:56:54 PM GMT 
+// Generated on: 2020.12.01 at 10:16:19 AM CET 
 //
 
 /*
@@ -30,21 +30,21 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * Java class for anonymous complex type.
+ * <p>Java class for anonymous complex type.
  * 
- * The following schema fragment specifies the expected content contained within this class.
+ * <p>The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType&gt;
@@ -451,9 +451,9 @@ public void setSession(String value) {
 
 
     /**
-     * Java class for anonymous complex type.
+     * <p>Java class for anonymous complex type.
      * 
-     * The following schema fragment specifies the expected content contained within this class.
+     * <p>The following schema fragment specifies the expected content contained within this class.
      * 
      * <pre>
      * &lt;complexType&gt;
@@ -489,36 +489,38 @@ public static class Properties {
 
         /**
          * Gets the value of the property property.
-         *
+         * 
+         * <p>
          * This accessor method returns a reference to the live list,
          * not a snapshot. Therefore any modification you make to the
-         * returned list will be present inside the JAXB object.
+         * returned list will be present inside the Jakarta XML Binding object.
          * This is why there is not a <CODE>set</CODE> method for the property property.
-         *
+         * 
+         * <p>
          * For example, to add a new item, do as follows:
          * <pre>
          *    getProperty().add(newItem);
          * </pre>
          * 
-         *
+         * 
+         * <p>
          * Objects of the following type(s) are allowed in the list
          * {@link Query.Properties.Property }
-         *
-         * @return the list of properties
+         * 
          * 
          */
         public List<Query.Properties.Property> getProperty() {
             if (property == null) {
-                property = new ArrayList<>();
+                property = new ArrayList<Query.Properties.Property>();
             }
             return this.property;
         }
 
 
         /**
-         * Java class for anonymous complex type.
+         * <p>Java class for anonymous complex type.
          * 
-         * The following schema fragment specifies the expected content contained within this class.
+         * <p>The following schema fragment specifies the expected content contained within this class.
          * 
          * <pre>
          * &lt;complexType&gt;
@@ -596,9 +598,9 @@ public void setValue(String value) {
 
 
     /**
-     * Java class for anonymous complex type.
+     * <p>Java class for anonymous complex type.
      * 
-     * The following schema fragment specifies the expected content contained within this class.
+     * <p>The following schema fragment specifies the expected content contained within this class.
      * 
      * <pre>
      * &lt;complexType&gt;
@@ -672,9 +674,9 @@ public void setVariable(Query.Variables.Variable value) {
 
 
         /**
-         * Java class for anonymous complex type.
+         * <p>Java class for anonymous complex type.
          * 
-         * The following schema fragment specifies the expected content contained within this class.
+         * <p>The following schema fragment specifies the expected content contained within this class.
          * 
          * <pre>
          * &lt;complexType&gt;
@@ -738,9 +740,9 @@ public void setQname(Query.Variables.Variable.Qname value) {
 
 
             /**
-             * Java class for anonymous complex type.
+             * <p>Java class for anonymous complex type.
              * 
-             * The following schema fragment specifies the expected content contained within this class.
+             * <p>The following schema fragment specifies the expected content contained within this class.
              * 
              * <pre>
              * &lt;complexType&gt;