Update to jakarta binding (outside jdk) with java 11
diff --git a/pom.xml b/pom.xml
index 8ef9c42..cfef288 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,16 +88,14 @@
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
- <version>2.3.3</version>
+ <version>4.0.0</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.3.3</version>
+ <version>4.0.2</version>
<scope>runtime</scope>
</dependency>
-
-
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3227f38..2b8ba37 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -25,8 +25,11 @@
</properties>
<body>
- <release version="2.0.1" date="in Subversion">
- <action dev="gk" type="update">
+ <release version="2.0.1" date="in Git">
+ <action dev="gk" type="update">
+ Update package / namespace for JAXB binding from jaxb to jakarta parsing with Java 11.
+ </action>
+ <action dev="gk" type="update">
Update dependencies testcontainer 1.0.9 (inherits junit)
</action>
<action dev="painter" type="update">
diff --git a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
index 0095c3b..85e6b68 100644
--- a/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
+++ b/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
@@ -39,10 +39,6 @@
import java.util.Set;
import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
-import javax.xml.bind.Unmarshaller.Listener;
-import javax.xml.bind.helpers.DefaultValidationEventHandler;
import javax.xml.validation.SchemaFactory;
import org.apache.avalon.framework.activity.Initializable;
@@ -65,6 +61,11 @@
import org.apache.fulcrum.intake.model.Field;
import org.apache.fulcrum.intake.model.Group;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.Unmarshaller.Listener;
+import jakarta.xml.bind.helpers.DefaultValidationEventHandler;
+
/**
* This service provides access to input processing objects based on an XML
* specification.
diff --git a/src/java/org/apache/fulcrum/intake/model/AppData.java b/src/java/org/apache/fulcrum/intake/model/AppData.java
index cfd199c..0960b7c 100644
--- a/src/java/org/apache/fulcrum/intake/model/AppData.java
+++ b/src/java/org/apache/fulcrum/intake/model/AppData.java
@@ -23,14 +23,14 @@
import java.util.List;
import java.util.stream.Collectors;
-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 org.apache.fulcrum.intake.IntakeException;
+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;
+
/**
* A class for holding application data structures.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java b/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
index 480c14d..6e743d1 100644
--- a/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
+++ b/src/java/org/apache/fulcrum/intake/model/FieldAdapter.java
@@ -19,10 +19,11 @@
* under the License.
*/
-import javax.xml.bind.annotation.adapters.XmlAdapter;
import org.apache.fulcrum.intake.IntakeException;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
/**
* Creates Field objects.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/FieldType.java b/src/java/org/apache/fulcrum/intake/model/FieldType.java
index bb8503f..2e9fac8 100644
--- a/src/java/org/apache/fulcrum/intake/model/FieldType.java
+++ b/src/java/org/apache/fulcrum/intake/model/FieldType.java
@@ -22,11 +22,12 @@
import java.io.Serializable;
import java.lang.reflect.Constructor;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
import org.apache.fulcrum.intake.IntakeException;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+
/**
* Enum for valid field types.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/Group.java b/src/java/org/apache/fulcrum/intake/model/Group.java
index 91db443..bfd027d 100644
--- a/src/java/org/apache/fulcrum/intake/model/Group.java
+++ b/src/java/org/apache/fulcrum/intake/model/Group.java
@@ -27,14 +27,6 @@
import java.util.ListIterator;
import java.util.Map;
-import javax.xml.bind.Unmarshaller;
-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.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.lang3.StringUtils;
@@ -46,6 +38,14 @@
import org.apache.fulcrum.intake.Retrievable;
import org.apache.fulcrum.parser.ValueParser;
+import jakarta.xml.bind.Unmarshaller;
+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.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
/**
* Holds a group of Fields
*
@@ -651,7 +651,7 @@
}
/**
- * JAXB callback to set the parent object
+ * JAXB / Jakarta callback to set the parent object
*
* @param um the Unmarshaller
* @param parent the parent object (an AppData object)
diff --git a/src/java/org/apache/fulcrum/intake/model/Rule.java b/src/java/org/apache/fulcrum/intake/model/Rule.java
index eb6b2bd..7a97dbc 100644
--- a/src/java/org/apache/fulcrum/intake/model/Rule.java
+++ b/src/java/org/apache/fulcrum/intake/model/Rule.java
@@ -21,14 +21,14 @@
import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
import org.apache.fulcrum.intake.validator.Constraint;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlValue;
+
/**
* A Class for holding data about a constraint on a property.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/XmlField.java b/src/java/org/apache/fulcrum/intake/model/XmlField.java
index 0de0349..786cf86 100644
--- a/src/java/org/apache/fulcrum/intake/model/XmlField.java
+++ b/src/java/org/apache/fulcrum/intake/model/XmlField.java
@@ -28,17 +28,17 @@
import java.util.List;
import java.util.Map;
-import javax.xml.bind.Unmarshaller;
-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.XmlType;
-
import org.apache.avalon.framework.logger.LogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.commons.lang3.StringUtils;
+import jakarta.xml.bind.Unmarshaller;
+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.XmlType;
+
/**
* A Class for holding data about a property used in an Application.
*
diff --git a/src/java/org/apache/fulcrum/intake/model/package-info.java b/src/java/org/apache/fulcrum/intake/model/package-info.java
index 3b1f733..66bf713 100644
--- a/src/java/org/apache/fulcrum/intake/model/package-info.java
+++ b/src/java/org/apache/fulcrum/intake/model/package-info.java
@@ -1,6 +1,6 @@
-@javax.xml.bind.annotation.XmlSchema(
+@jakarta.xml.bind.annotation.XmlSchema(
namespace = "http://turbine.apache.org/schema/intake/4.0",
- elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+ elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.apache.fulcrum.intake.model;
