From 4598aaf4cb0f681564114df418832c86d05ddd50 Mon Sep 17 00:00:00 2001 From: Florian Schleich Date: Mon, 4 Nov 2024 10:55:15 -0800 Subject: [PATCH 1/7] javax to jakarta migration - updates JAXB dependencies to latest version - updates JDK source/target from 8 to 11 - replaces use of javax.xml.bind.* with jakarta.xml.bind.* throughout code --- .gitignore | 3 ++- pom.xml | 19 ++++++++-------- .../smpte/register/ElementsRegister.java | 12 +++++----- .../smpte/register/GroupsRegister.java | 12 +++++----- .../smpte/register/LabelsRegister.java | 12 +++++----- .../smpte/register/TypesRegister.java | 12 +++++----- .../brown_sauce/GroupsRegisterModel.java | 18 +++++++-------- .../register/brown_sauce/package-info.java | 4 ++-- .../catsup/ElementsRegisterModel.java | 14 ++++++------ .../register/catsup/GroupsRegisterModel.java | 16 +++++++------- .../register/catsup/LabelsRegisterModel.java | 14 ++++++------ .../register/catsup/TypesRegisterModel.java | 16 +++++++------- .../smpte/register/catsup/package-info.java | 4 ++-- .../sandflow/smpte/register/package-info.java | 4 ++-- .../smpte/regxml/dict/MetaDictionary.java | 22 +++++++++---------- .../definitions/CharacterTypeDefinition.java | 4 ++-- .../dict/definitions/ClassDefinition.java | 8 +++---- .../regxml/dict/definitions/Definition.java | 10 ++++----- .../EnumerationTypeDefinition.java | 14 ++++++------ .../ExtendibleEnumerationTypeDefinition.java | 8 +++---- .../definitions/FixedArrayTypeDefinition.java | 8 +++---- .../dict/definitions/FloatTypeDefinition.java | 12 +++++----- .../definitions/IndirectTypeDefinition.java | 4 ++-- .../definitions/IntegerTypeDefinition.java | 10 ++++----- .../LensSerialFloatTypeDefinition.java | 4 ++-- .../definitions/OpaqueTypeDefinition.java | 4 ++-- .../definitions/PropertyAliasDefinition.java | 8 +++---- .../dict/definitions/PropertyDefinition.java | 8 +++---- .../definitions/RecordTypeDefinition.java | 12 +++++----- .../definitions/RenameTypeDefinition.java | 8 +++---- .../dict/definitions/SetTypeDefinition.java | 8 +++---- .../definitions/StreamTypeDefinition.java | 4 ++-- .../definitions/StringTypeDefinition.java | 8 +++---- .../StrongReferenceTypeDefinition.java | 8 +++---- .../VariableArrayTypeDefinition.java | 8 +++---- .../WeakReferenceTypeDefinition.java | 10 ++++----- .../regxml/dict/definitions/package-info.java | 6 ++--- .../smpte/regxml/dict/package-info.java | 6 ++--- .../tools/GenerateDictionaryXMLSchema.java | 2 +- .../tools/GenerateXMLSchemaDocuments.java | 6 ++--- .../smpte/tools/XMLRegistersToDict.java | 2 +- .../sandflow/smpte/util/xml/AUIDAdapter.java | 2 +- .../smpte/util/xml/HexBinaryByteAdapter.java | 6 ++--- .../smpte/util/xml/HexBinaryLongAdapter.java | 4 ++-- .../sandflow/smpte/util/xml/ULAdapter.java | 2 +- .../sandflow/smpte/util/xml/UUIDAdapter.java | 2 +- .../sandflow/smpte/util/xml/package-info.java | 2 +- .../smpte/regxml/XMLSchemaBuilderTest.java | 2 +- .../sandflow/smpte/tools/RegXMLDumpTest.java | 2 +- 49 files changed, 197 insertions(+), 197 deletions(-) diff --git a/.gitignore b/.gitignore index aa9d277..daa71ee 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ CMakeSettings.json .project .settings .vscode/ -.classpath \ No newline at end of file +.classpath +.DS_Store diff --git a/pom.xml b/pom.xml index 4400282..47d9737 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ jar - 1.8 - 1.8 + 11 + 11 UTF-8 ${basedir}/src/main/config ${basedir}/src/main/resources @@ -53,6 +53,11 @@ 4.13.1 test + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 + @@ -99,22 +104,16 @@ true - - javax.xml.bind - jaxb-api - 2.3.1 - runtime - com.sun.xml.bind jaxb-impl - 2.3.1 + 4.0.5 runtime com.sun.xml.bind jaxb-core - 2.3.0.1 + 4.0.5 runtime diff --git a/src/main/java/com/sandflow/smpte/register/ElementsRegister.java b/src/main/java/com/sandflow/smpte/register/ElementsRegister.java index 6159234..66e02e7 100644 --- a/src/main/java/com/sandflow/smpte/register/ElementsRegister.java +++ b/src/main/java/com/sandflow/smpte/register/ElementsRegister.java @@ -33,12 +33,12 @@ import java.net.URI; import java.util.Collection; import java.util.HashMap; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Elements Register as defined in SMPTE ST 335 diff --git a/src/main/java/com/sandflow/smpte/register/GroupsRegister.java b/src/main/java/com/sandflow/smpte/register/GroupsRegister.java index ffcbfd8..6913063 100644 --- a/src/main/java/com/sandflow/smpte/register/GroupsRegister.java +++ b/src/main/java/com/sandflow/smpte/register/GroupsRegister.java @@ -34,12 +34,12 @@ import java.util.Collection; import java.util.HashMap; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Groups Register as defined in SMPTE ST 395 diff --git a/src/main/java/com/sandflow/smpte/register/LabelsRegister.java b/src/main/java/com/sandflow/smpte/register/LabelsRegister.java index 10306a5..a597fc0 100644 --- a/src/main/java/com/sandflow/smpte/register/LabelsRegister.java +++ b/src/main/java/com/sandflow/smpte/register/LabelsRegister.java @@ -33,12 +33,12 @@ import java.net.URI; import java.util.Collection; import java.util.HashMap; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Labels Register as defined in SMPTE ST 400 diff --git a/src/main/java/com/sandflow/smpte/register/TypesRegister.java b/src/main/java/com/sandflow/smpte/register/TypesRegister.java index f1e9fbe..f55fee2 100644 --- a/src/main/java/com/sandflow/smpte/register/TypesRegister.java +++ b/src/main/java/com/sandflow/smpte/register/TypesRegister.java @@ -35,12 +35,12 @@ import java.util.EnumSet; import java.util.HashMap; import java.util.List; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Types Register as defined in SMPTE ST 2003 diff --git a/src/main/java/com/sandflow/smpte/register/brown_sauce/GroupsRegisterModel.java b/src/main/java/com/sandflow/smpte/register/brown_sauce/GroupsRegisterModel.java index eb8dd57..50edb42 100644 --- a/src/main/java/com/sandflow/smpte/register/brown_sauce/GroupsRegisterModel.java +++ b/src/main/java/com/sandflow/smpte/register/brown_sauce/GroupsRegisterModel.java @@ -35,15 +35,15 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchemaType; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Groups Register as defined in SMPTE ST 395 diff --git a/src/main/java/com/sandflow/smpte/register/brown_sauce/package-info.java b/src/main/java/com/sandflow/smpte/register/brown_sauce/package-info.java index bfbc6f1..e48bb2b 100644 --- a/src/main/java/com/sandflow/smpte/register/brown_sauce/package-info.java +++ b/src/main/java/com/sandflow/smpte/register/brown_sauce/package-info.java @@ -31,6 +31,6 @@ package com.sandflow.smpte.register.brown_sauce; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/src/main/java/com/sandflow/smpte/register/catsup/ElementsRegisterModel.java b/src/main/java/com/sandflow/smpte/register/catsup/ElementsRegisterModel.java index 6b3157a..4cc0a4c 100644 --- a/src/main/java/com/sandflow/smpte/register/catsup/ElementsRegisterModel.java +++ b/src/main/java/com/sandflow/smpte/register/catsup/ElementsRegisterModel.java @@ -30,13 +30,13 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Elements Register as defined in SMPTE ST 335 diff --git a/src/main/java/com/sandflow/smpte/register/catsup/GroupsRegisterModel.java b/src/main/java/com/sandflow/smpte/register/catsup/GroupsRegisterModel.java index a7af7e7..bf2ce5b 100644 --- a/src/main/java/com/sandflow/smpte/register/catsup/GroupsRegisterModel.java +++ b/src/main/java/com/sandflow/smpte/register/catsup/GroupsRegisterModel.java @@ -33,14 +33,14 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Groups Register as defined in SMPTE ST 395 diff --git a/src/main/java/com/sandflow/smpte/register/catsup/LabelsRegisterModel.java b/src/main/java/com/sandflow/smpte/register/catsup/LabelsRegisterModel.java index 7562e1a..bc69e20 100644 --- a/src/main/java/com/sandflow/smpte/register/catsup/LabelsRegisterModel.java +++ b/src/main/java/com/sandflow/smpte/register/catsup/LabelsRegisterModel.java @@ -30,13 +30,13 @@ import java.net.URI; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Labels Register as defined in SMPTE ST 400 diff --git a/src/main/java/com/sandflow/smpte/register/catsup/TypesRegisterModel.java b/src/main/java/com/sandflow/smpte/register/catsup/TypesRegisterModel.java index 96221ed..876b414 100644 --- a/src/main/java/com/sandflow/smpte/register/catsup/TypesRegisterModel.java +++ b/src/main/java/com/sandflow/smpte/register/catsup/TypesRegisterModel.java @@ -32,14 +32,14 @@ import java.util.Collection; import java.util.EnumSet; import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlList; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlList; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Types Register as defined in SMPTE ST 2003 diff --git a/src/main/java/com/sandflow/smpte/register/catsup/package-info.java b/src/main/java/com/sandflow/smpte/register/catsup/package-info.java index 4c04c9a..66454f3 100644 --- a/src/main/java/com/sandflow/smpte/register/catsup/package-info.java +++ b/src/main/java/com/sandflow/smpte/register/catsup/package-info.java @@ -31,6 +31,6 @@ package com.sandflow.smpte.register.catsup; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/src/main/java/com/sandflow/smpte/register/package-info.java b/src/main/java/com/sandflow/smpte/register/package-info.java index 906b7a4..8e3bc8e 100644 --- a/src/main/java/com/sandflow/smpte/register/package-info.java +++ b/src/main/java/com/sandflow/smpte/register/package-info.java @@ -33,6 +33,6 @@ package com.sandflow.smpte.register; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/MetaDictionary.java b/src/main/java/com/sandflow/smpte/regxml/dict/MetaDictionary.java index c39dfb4..0800afa 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/MetaDictionary.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/MetaDictionary.java @@ -60,17 +60,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Set; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.XmlElements; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.w3c.dom.Document; diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/CharacterTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/CharacterTypeDefinition.java index 37c73c1..7d7b807 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/CharacterTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/CharacterTypeDefinition.java @@ -25,8 +25,8 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; /** * Character Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ClassDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ClassDefinition.java index 0ea33f5..f159876 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ClassDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ClassDefinition.java @@ -28,10 +28,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Class Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/Definition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/Definition.java index 3900dd5..e5009a2 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/Definition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/Definition.java @@ -29,11 +29,11 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; import java.net.URI; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Base type for the MetaDictionary definitions. Each concrete subclass corresponds to diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/EnumerationTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/EnumerationTypeDefinition.java index e48af57..7a09c46 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/EnumerationTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/EnumerationTypeDefinition.java @@ -30,13 +30,13 @@ import com.sandflow.smpte.util.xml.AUIDAdapter; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ExtendibleEnumerationTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ExtendibleEnumerationTypeDefinition.java index a906972..f5948e1 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ExtendibleEnumerationTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/ExtendibleEnumerationTypeDefinition.java @@ -29,10 +29,10 @@ import com.sandflow.smpte.util.xml.AUIDAdapter; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Extendible Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FixedArrayTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FixedArrayTypeDefinition.java index ddc91ff..93a78a2 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FixedArrayTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FixedArrayTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Fixed Array Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FloatTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FloatTypeDefinition.java index 88dea3e..0302c3a 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FloatTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/FloatTypeDefinition.java @@ -25,12 +25,12 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlType; /** * Float Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IndirectTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IndirectTypeDefinition.java index 714ae13..27060ab 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IndirectTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IndirectTypeDefinition.java @@ -25,8 +25,8 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; /** * Indirect Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IntegerTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IntegerTypeDefinition.java index e480d7a..375bad9 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IntegerTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/IntegerTypeDefinition.java @@ -25,11 +25,11 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; /** * Integer Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/LensSerialFloatTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/LensSerialFloatTypeDefinition.java index fc76755..9fb12d9 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/LensSerialFloatTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/LensSerialFloatTypeDefinition.java @@ -25,8 +25,8 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; /** * Corresponds to a type defined in RDD 18. diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/OpaqueTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/OpaqueTypeDefinition.java index 634e5d8..5be23c5 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/OpaqueTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/OpaqueTypeDefinition.java @@ -25,8 +25,8 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; /** * Opaque Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyAliasDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyAliasDefinition.java index b49237a..2aa5a15 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyAliasDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyAliasDefinition.java @@ -28,10 +28,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Property Alias Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyDefinition.java index c1bd584..5a65137 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/PropertyDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Property Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RecordTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RecordTypeDefinition.java index 65ef8aa..365a6b4 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RecordTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RecordTypeDefinition.java @@ -30,12 +30,12 @@ import com.sandflow.smpte.util.xml.AUIDAdapter; import java.util.ArrayList; import java.util.Collection; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAnyElement; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.w3c.dom.Document; diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RenameTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RenameTypeDefinition.java index 6db0d93..53a7ea8 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RenameTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/RenameTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Rename Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/SetTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/SetTypeDefinition.java index 322e38d..7640070 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/SetTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/SetTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Set Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StreamTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StreamTypeDefinition.java index 62e39d6..25f99e8 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StreamTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StreamTypeDefinition.java @@ -25,8 +25,8 @@ */ package com.sandflow.smpte.regxml.dict.definitions; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; /** * Stream Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StringTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StringTypeDefinition.java index 60fc1c4..01d71fa 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StringTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StringTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * String Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StrongReferenceTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StrongReferenceTypeDefinition.java index 2deeb6f..ec2c4ec 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StrongReferenceTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/StrongReferenceTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Strong Reference Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/VariableArrayTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/VariableArrayTypeDefinition.java index 2ad5a52..2dc8563 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/VariableArrayTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/VariableArrayTypeDefinition.java @@ -27,10 +27,10 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Variable Array Type Definition as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/WeakReferenceTypeDefinition.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/WeakReferenceTypeDefinition.java index 06c5b49..83e2452 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/WeakReferenceTypeDefinition.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/WeakReferenceTypeDefinition.java @@ -28,11 +28,11 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.xml.AUIDAdapter; import java.util.ArrayList; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** * Weak Reference Type as defined in ST 2001-1 diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/package-info.java b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/package-info.java index dba29ef..8e21ae2 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/definitions/package-info.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/definitions/package-info.java @@ -36,7 +36,7 @@ package com.sandflow.smpte.regxml.dict.definitions; import com.sandflow.smpte.regxml.dict.MetaDictionary; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/src/main/java/com/sandflow/smpte/regxml/dict/package-info.java b/src/main/java/com/sandflow/smpte/regxml/dict/package-info.java index 2c59c22..2993d7e 100644 --- a/src/main/java/com/sandflow/smpte/regxml/dict/package-info.java +++ b/src/main/java/com/sandflow/smpte/regxml/dict/package-info.java @@ -35,7 +35,7 @@ elementFormDefault=XmlNsForm.QUALIFIED) package com.sandflow.smpte.regxml.dict; -import javax.xml.bind.annotation.XmlNs; -import javax.xml.bind.annotation.XmlNsForm; -import javax.xml.bind.annotation.XmlSchema; +import jakarta.xml.bind.annotation.XmlNs; +import jakarta.xml.bind.annotation.XmlNsForm; +import jakarta.xml.bind.annotation.XmlSchema; diff --git a/src/main/java/com/sandflow/smpte/tools/GenerateDictionaryXMLSchema.java b/src/main/java/com/sandflow/smpte/tools/GenerateDictionaryXMLSchema.java index d954a39..e54db40 100644 --- a/src/main/java/com/sandflow/smpte/tools/GenerateDictionaryXMLSchema.java +++ b/src/main/java/com/sandflow/smpte/tools/GenerateDictionaryXMLSchema.java @@ -44,7 +44,7 @@ import java.nio.file.StandardCopyOption; import java.util.Date; import java.util.logging.Logger; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.OutputKeys; diff --git a/src/main/java/com/sandflow/smpte/tools/GenerateXMLSchemaDocuments.java b/src/main/java/com/sandflow/smpte/tools/GenerateXMLSchemaDocuments.java index 352720e..04a8df8 100644 --- a/src/main/java/com/sandflow/smpte/tools/GenerateXMLSchemaDocuments.java +++ b/src/main/java/com/sandflow/smpte/tools/GenerateXMLSchemaDocuments.java @@ -32,9 +32,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Date; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.SchemaOutputResolver; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.SchemaOutputResolver; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.OutputKeys; diff --git a/src/main/java/com/sandflow/smpte/tools/XMLRegistersToDict.java b/src/main/java/com/sandflow/smpte/tools/XMLRegistersToDict.java index 64e44d7..8f10b3d 100644 --- a/src/main/java/com/sandflow/smpte/tools/XMLRegistersToDict.java +++ b/src/main/java/com/sandflow/smpte/tools/XMLRegistersToDict.java @@ -41,7 +41,7 @@ import java.io.IOException; import java.util.Date; import java.util.logging.Logger; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.transform.OutputKeys; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; diff --git a/src/main/java/com/sandflow/smpte/util/xml/AUIDAdapter.java b/src/main/java/com/sandflow/smpte/util/xml/AUIDAdapter.java index f7edde5..d6cbc06 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/AUIDAdapter.java +++ b/src/main/java/com/sandflow/smpte/util/xml/AUIDAdapter.java @@ -27,7 +27,7 @@ import com.sandflow.smpte.util.AUID; import com.sandflow.smpte.util.UL; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Unmarshals/marshals an xsd:string to/from a AIUD diff --git a/src/main/java/com/sandflow/smpte/util/xml/HexBinaryByteAdapter.java b/src/main/java/com/sandflow/smpte/util/xml/HexBinaryByteAdapter.java index 271d9fc..5cd8307 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/HexBinaryByteAdapter.java +++ b/src/main/java/com/sandflow/smpte/util/xml/HexBinaryByteAdapter.java @@ -25,9 +25,9 @@ */ package com.sandflow.smpte.util.xml; -import static javax.xml.bind.DatatypeConverter.parseHexBinary; -import static javax.xml.bind.DatatypeConverter.printHexBinary; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import static jakarta.xml.bind.DatatypeConverter.parseHexBinary; +import static jakarta.xml.bind.DatatypeConverter.printHexBinary; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Unmarshals/marshals a byte from/to an xsd:string diff --git a/src/main/java/com/sandflow/smpte/util/xml/HexBinaryLongAdapter.java b/src/main/java/com/sandflow/smpte/util/xml/HexBinaryLongAdapter.java index e2585e6..65a6876 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/HexBinaryLongAdapter.java +++ b/src/main/java/com/sandflow/smpte/util/xml/HexBinaryLongAdapter.java @@ -26,8 +26,8 @@ package com.sandflow.smpte.util.xml; import java.util.Arrays; -import javax.xml.bind.DatatypeConverter; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.DatatypeConverter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Unmarshals/marshals a hexadecimal integer from/to an xsd:string value diff --git a/src/main/java/com/sandflow/smpte/util/xml/ULAdapter.java b/src/main/java/com/sandflow/smpte/util/xml/ULAdapter.java index dc08350..642d460 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/ULAdapter.java +++ b/src/main/java/com/sandflow/smpte/util/xml/ULAdapter.java @@ -26,7 +26,7 @@ package com.sandflow.smpte.util.xml; import com.sandflow.smpte.util.UL; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Unmarshals/marshals an xsd:string to/from a SMPTE UL diff --git a/src/main/java/com/sandflow/smpte/util/xml/UUIDAdapter.java b/src/main/java/com/sandflow/smpte/util/xml/UUIDAdapter.java index 287bd37..b561e39 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/UUIDAdapter.java +++ b/src/main/java/com/sandflow/smpte/util/xml/UUIDAdapter.java @@ -26,7 +26,7 @@ package com.sandflow.smpte.util.xml; import com.sandflow.smpte.util.UUID; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Unmarshals/marshals an xsd:string to/from a UUID diff --git a/src/main/java/com/sandflow/smpte/util/xml/package-info.java b/src/main/java/com/sandflow/smpte/util/xml/package-info.java index f99b543..edaf7b1 100644 --- a/src/main/java/com/sandflow/smpte/util/xml/package-info.java +++ b/src/main/java/com/sandflow/smpte/util/xml/package-info.java @@ -25,6 +25,6 @@ */ /** - * Defines {@link javax.xml.bind.annotation.adapters.XmlAdapter} implementations for SMPTE-related structures + * Defines {@link jakarta.xml.bind.annotation.adapters.XmlAdapter} implementations for SMPTE-related structures */ package com.sandflow.smpte.util.xml; diff --git a/src/test/java/com/sandflow/smpte/regxml/XMLSchemaBuilderTest.java b/src/test/java/com/sandflow/smpte/regxml/XMLSchemaBuilderTest.java index 7ea64e6..c873a8a 100644 --- a/src/test/java/com/sandflow/smpte/regxml/XMLSchemaBuilderTest.java +++ b/src/test/java/com/sandflow/smpte/regxml/XMLSchemaBuilderTest.java @@ -43,7 +43,7 @@ import java.net.URISyntaxException; import java.util.Arrays; import java.util.logging.Logger; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; import org.w3c.dom.Document; import org.xml.sax.SAXException; diff --git a/src/test/java/com/sandflow/smpte/tools/RegXMLDumpTest.java b/src/test/java/com/sandflow/smpte/tools/RegXMLDumpTest.java index 6601305..58556e3 100644 --- a/src/test/java/com/sandflow/smpte/tools/RegXMLDumpTest.java +++ b/src/test/java/com/sandflow/smpte/tools/RegXMLDumpTest.java @@ -33,7 +33,7 @@ import java.nio.file.Paths; import java.util.ArrayList; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.TransformerException; From dc5083d7890383109bf38031cfcb53268f6f449b Mon Sep 17 00:00:00 2001 From: Florian Schleich Date: Wed, 15 Jan 2025 17:51:46 -0800 Subject: [PATCH 2/7] Updated readme to reflect move to Java 11 --- README.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.txt b/README.txt index 92c24fc..f635527 100644 --- a/README.txt +++ b/README.txt @@ -45,7 +45,7 @@ REGXMLLIBJ Prerequisites ------------- -Java 8 language and SDK +Java 11 language and SDK Maven From f29808f1669a5e149cdd43c2ba43ad7de8b3f1c4 Mon Sep 17 00:00:00 2001 From: Pierre-Anthony Lemieux Date: Wed, 15 Jan 2025 22:07:09 -0800 Subject: [PATCH 3/7] Bump version Remove source and target compiler options Add CI testing for 3 version of Java --- .github/workflows/main.yaml | 27 +++++++++++++++++++-------- README.txt | 2 +- pom.xml | 4 +--- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index a7b46c7..ad98288 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -3,25 +3,36 @@ name: Test on: [push, pull_request] jobs: - build: - - runs-on: ubuntu-latest - + JavaBuild: + name: Test regxmllibJ if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request' + runs-on: ubuntu-latest + strategy: + matrix: + java-version: [11, 17, 21] steps: - - name: install dependencies - run: sudo apt install libxerces-c-dev - name: Checkout repo uses: actions/checkout@v3 - - name: Set up JDK 8 + - name: Set up a JDK uses: actions/setup-java@v3 with: - java-version: '8' + java-version: ${{ matrix.java-version }} distribution: 'corretto' cache: maven - name: Test Java run: mvn test + + cpp_build: + name: Test regxmllibC + if: (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'pull_request' + runs-on: ubuntu-latest + + steps: + - name: install dependencies + run: sudo apt install libxerces-c-dev + - name: Checkout repo + uses: actions/checkout@v3 - name: Test C++ run: | cmake -B build diff --git a/README.txt b/README.txt index f635527..7890be5 100644 --- a/README.txt +++ b/README.txt @@ -45,7 +45,7 @@ REGXMLLIBJ Prerequisites ------------- -Java 11 language and SDK +Java 11 and above Maven diff --git a/pom.xml b/pom.xml index 47d9737..2a9068e 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,10 @@ com.sandflow regxmllib - 1.1.4 + 1.1.5-rc.1 jar - 11 - 11 UTF-8 ${basedir}/src/main/config ${basedir}/src/main/resources From c12c6043501a80c8a2b8fd039894412bbda43ef2 Mon Sep 17 00:00:00 2001 From: Pierre-Anthony Lemieux Date: Wed, 15 Jan 2025 22:10:40 -0800 Subject: [PATCH 4/7] Add back compiler targets --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 2a9068e..74a4919 100644 --- a/pom.xml +++ b/pom.xml @@ -8,6 +8,8 @@ jar + 1.8 + 1.8 UTF-8 ${basedir}/src/main/config ${basedir}/src/main/resources From e9ccc9e336961141313b9a8b5a15c9540896ed64 Mon Sep 17 00:00:00 2001 From: Florian Schleich Date: Thu, 16 Jan 2025 06:26:19 -0800 Subject: [PATCH 5/7] Reset .gitignore file --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index daa71ee..3694c08 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ CMakeSettings.json .settings .vscode/ .classpath -.DS_Store From e83801febb521de73360cd966ea831d61ab21928 Mon Sep 17 00:00:00 2001 From: Florian Schleich Date: Thu, 16 Jan 2025 06:45:12 -0800 Subject: [PATCH 6/7] Reverting java source/target to Java 8 in POM file --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 47d9737..d6f3c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -8,8 +8,8 @@ jar - 11 - 11 + 1.8 + 1.8 UTF-8 ${basedir}/src/main/config ${basedir}/src/main/resources From dc745f5a76457e4c35e0e2a07a70d9defd3d4f90 Mon Sep 17 00:00:00 2001 From: Pierre-Anthony Lemieux Date: Thu, 16 Jan 2025 13:53:46 -0800 Subject: [PATCH 7/7] Update pom.xml Co-authored-by: Florian Schleich --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 74a4919..616232d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.sandflow regxmllib - 1.1.5-rc.1 + 1.1.6-rc.1 jar