diff --git a/aom/src/main/java/com/nedap/archie/adl14/aom14/ArchetypeOntology.java b/aom/src/main/java/com/nedap/archie/adl14/aom14/ArchetypeOntology.java index 720ec6ecf..c00a0a368 100644 --- a/aom/src/main/java/com/nedap/archie/adl14/aom14/ArchetypeOntology.java +++ b/aom/src/main/java/com/nedap/archie/adl14/aom14/ArchetypeOntology.java @@ -5,8 +5,8 @@ import com.nedap.archie.aom.terminology.ArchetypeTerm; import com.nedap.archie.aom.terminology.ValueSet; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.net.URI; import java.util.List; import java.util.Map; diff --git a/aom/src/main/java/com/nedap/archie/aom/Archetype.java b/aom/src/main/java/com/nedap/archie/aom/Archetype.java index 583ecf964..fdab9463c 100644 --- a/aom/src/main/java/com/nedap/archie/aom/Archetype.java +++ b/aom/src/main/java/com/nedap/archie/aom/Archetype.java @@ -19,10 +19,10 @@ import com.nedap.archie.xml.types.StringDictionaryItem; import javax.annotation.Nullable; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.*; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.*; import java.util.stream.Collectors; diff --git a/aom/src/main/java/com/nedap/archie/aom/ArchetypeConstraint.java b/aom/src/main/java/com/nedap/archie/aom/ArchetypeConstraint.java index ac7e01b30..13586c1e2 100644 --- a/aom/src/main/java/com/nedap/archie/aom/ArchetypeConstraint.java +++ b/aom/src/main/java/com/nedap/archie/aom/ArchetypeConstraint.java @@ -5,7 +5,7 @@ import com.nedap.archie.paths.PathUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/ArchetypeHRID.java b/aom/src/main/java/com/nedap/archie/aom/ArchetypeHRID.java index 9b6a60b7a..f682f56e1 100644 --- a/aom/src/main/java/com/nedap/archie/aom/ArchetypeHRID.java +++ b/aom/src/main/java/com/nedap/archie/aom/ArchetypeHRID.java @@ -7,10 +7,10 @@ import com.nedap.archie.definitions.VersionStatus; import com.nedap.archie.rminfo.RMPropertyIgnore; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/aom/src/main/java/com/nedap/archie/aom/ArchetypeSlot.java b/aom/src/main/java/com/nedap/archie/aom/ArchetypeSlot.java index aa06d131d..fae224d60 100644 --- a/aom/src/main/java/com/nedap/archie/aom/ArchetypeSlot.java +++ b/aom/src/main/java/com/nedap/archie/aom/ArchetypeSlot.java @@ -4,8 +4,8 @@ import com.nedap.archie.rules.Assertion; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/AuthoredArchetype.java b/aom/src/main/java/com/nedap/archie/aom/AuthoredArchetype.java index c0b887130..bb8e3df4e 100644 --- a/aom/src/main/java/com/nedap/archie/aom/AuthoredArchetype.java +++ b/aom/src/main/java/com/nedap/archie/aom/AuthoredArchetype.java @@ -1,9 +1,9 @@ package com.nedap.archie.aom; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; /** * diff --git a/aom/src/main/java/com/nedap/archie/aom/AuthoredResource.java b/aom/src/main/java/com/nedap/archie/aom/AuthoredResource.java index 14a4e086f..2da2c7ee9 100644 --- a/aom/src/main/java/com/nedap/archie/aom/AuthoredResource.java +++ b/aom/src/main/java/com/nedap/archie/aom/AuthoredResource.java @@ -9,12 +9,12 @@ import com.nedap.archie.xml.adapters.TranslationDetailsAdapter; import javax.annotation.Nullable; -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.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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/CArchetypeRoot.java b/aom/src/main/java/com/nedap/archie/aom/CArchetypeRoot.java index 61beee64d..01c3a32f0 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CArchetypeRoot.java +++ b/aom/src/main/java/com/nedap/archie/aom/CArchetypeRoot.java @@ -2,8 +2,8 @@ import com.nedap.archie.paths.PathSegment; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/CAttribute.java b/aom/src/main/java/com/nedap/archie/aom/CAttribute.java index 2a35c3bdf..b41bdfb8e 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CAttribute.java +++ b/aom/src/main/java/com/nedap/archie/aom/CAttribute.java @@ -11,12 +11,12 @@ import com.nedap.archie.rminfo.RMProperty; import javax.annotation.Nullable; -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.XmlTransient; -import javax.xml.bind.annotation.XmlType; +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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/CAttributeTuple.java b/aom/src/main/java/com/nedap/archie/aom/CAttributeTuple.java index 57ffc7701..fca98424b 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CAttributeTuple.java +++ b/aom/src/main/java/com/nedap/archie/aom/CAttributeTuple.java @@ -5,7 +5,7 @@ import com.nedap.archie.rminfo.RMAttributeInfo; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; import java.util.HashMap; diff --git a/aom/src/main/java/com/nedap/archie/aom/CComplexObject.java b/aom/src/main/java/com/nedap/archie/aom/CComplexObject.java index 998055a91..18484d8df 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CComplexObject.java +++ b/aom/src/main/java/com/nedap/archie/aom/CComplexObject.java @@ -6,10 +6,10 @@ import com.nedap.archie.query.AOMPathQuery; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/CComplexObjectProxy.java b/aom/src/main/java/com/nedap/archie/aom/CComplexObjectProxy.java index 87476084d..5f64ac11e 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CComplexObjectProxy.java +++ b/aom/src/main/java/com/nedap/archie/aom/CComplexObjectProxy.java @@ -1,7 +1,7 @@ package com.nedap.archie.aom; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 19/10/15. diff --git a/aom/src/main/java/com/nedap/archie/aom/CDefinedObject.java b/aom/src/main/java/com/nedap/archie/aom/CDefinedObject.java index fd646de62..1df0c0cde 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CDefinedObject.java +++ b/aom/src/main/java/com/nedap/archie/aom/CDefinedObject.java @@ -1,8 +1,8 @@ package com.nedap.archie.aom; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlType; /** * Defined Object. Parameterized so the default value methods can be overridden with a different type diff --git a/aom/src/main/java/com/nedap/archie/aom/CObject.java b/aom/src/main/java/com/nedap/archie/aom/CObject.java index 1cfe838ab..dec504bfd 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CObject.java +++ b/aom/src/main/java/com/nedap/archie/aom/CObject.java @@ -13,7 +13,7 @@ import org.openehr.utils.message.I18n; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/CPrimitiveObject.java b/aom/src/main/java/com/nedap/archie/aom/CPrimitiveObject.java index 3d67b6be6..507107617 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CPrimitiveObject.java +++ b/aom/src/main/java/com/nedap/archie/aom/CPrimitiveObject.java @@ -11,9 +11,9 @@ import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; import java.util.function.BiFunction; diff --git a/aom/src/main/java/com/nedap/archie/aom/CPrimitiveTuple.java b/aom/src/main/java/com/nedap/archie/aom/CPrimitiveTuple.java index fe0eed48e..ed66918d6 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CPrimitiveTuple.java +++ b/aom/src/main/java/com/nedap/archie/aom/CPrimitiveTuple.java @@ -1,6 +1,6 @@ package com.nedap.archie.aom; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.function.BiFunction; /** diff --git a/aom/src/main/java/com/nedap/archie/aom/CSecondOrder.java b/aom/src/main/java/com/nedap/archie/aom/CSecondOrder.java index 7ce548b36..37a168411 100644 --- a/aom/src/main/java/com/nedap/archie/aom/CSecondOrder.java +++ b/aom/src/main/java/com/nedap/archie/aom/CSecondOrder.java @@ -1,7 +1,7 @@ package com.nedap.archie.aom; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/OperationalTemplate.java b/aom/src/main/java/com/nedap/archie/aom/OperationalTemplate.java index 9e5a23cf0..ecc70f9c6 100644 --- a/aom/src/main/java/com/nedap/archie/aom/OperationalTemplate.java +++ b/aom/src/main/java/com/nedap/archie/aom/OperationalTemplate.java @@ -1,9 +1,9 @@ package com.nedap.archie.aom; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; import com.fasterxml.jackson.annotation.JsonIgnore; import com.nedap.archie.aom.terminology.ArchetypeTerm; @@ -15,10 +15,10 @@ import com.nedap.archie.xml.types.StringDictionaryItem; import com.nedap.archie.xml.types.XmlArchetypeTerminology; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.Collections; diff --git a/aom/src/main/java/com/nedap/archie/aom/ResourceAnnotations.java b/aom/src/main/java/com/nedap/archie/aom/ResourceAnnotations.java index d58fe274d..6f58a1e50 100644 --- a/aom/src/main/java/com/nedap/archie/aom/ResourceAnnotations.java +++ b/aom/src/main/java/com/nedap/archie/aom/ResourceAnnotations.java @@ -1,10 +1,10 @@ package com.nedap.archie.aom; -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.XmlType; +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.XmlType; import java.util.Map; /** diff --git a/aom/src/main/java/com/nedap/archie/aom/Template.java b/aom/src/main/java/com/nedap/archie/aom/Template.java index 99d0e8af8..7b8601238 100644 --- a/aom/src/main/java/com/nedap/archie/aom/Template.java +++ b/aom/src/main/java/com/nedap/archie/aom/Template.java @@ -1,10 +1,10 @@ package com.nedap.archie.aom; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/TemplateOverlay.java b/aom/src/main/java/com/nedap/archie/aom/TemplateOverlay.java index 715edb149..74efa3925 100644 --- a/aom/src/main/java/com/nedap/archie/aom/TemplateOverlay.java +++ b/aom/src/main/java/com/nedap/archie/aom/TemplateOverlay.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Template overlay class, for the template overlays used in a template. Has one implementation specific addition to the normal archetype: methods to obtain the owning archetype diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CBoolean.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CBoolean.java index 2918dda27..52244f64f 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CBoolean.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CBoolean.java @@ -7,10 +7,10 @@ import org.openehr.utils.message.I18n; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.function.BiFunction; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CDate.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CDate.java index 297865042..1e9bfc657 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CDate.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CDate.java @@ -5,11 +5,11 @@ import com.nedap.archie.xml.adapters.DateXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.temporal.Temporal; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CDateTime.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CDateTime.java index 0d55a85ea..d0ac9e41a 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CDateTime.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CDateTime.java @@ -5,11 +5,11 @@ import com.nedap.archie.xml.adapters.DateTimeXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.temporal.TemporalAccessor; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CDuration.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CDuration.java index 1df9846ce..6113046ca 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CDuration.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CDuration.java @@ -5,11 +5,11 @@ import com.nedap.archie.xml.adapters.DurationXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.temporal.TemporalAmount; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CInteger.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CInteger.java index 24cbcb4ec..201abfc6c 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CInteger.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CInteger.java @@ -4,10 +4,10 @@ import com.nedap.archie.base.Interval; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.beans.Transient; import java.util.ArrayList; import java.util.Arrays; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CReal.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CReal.java index 0adf7900c..c58272608 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CReal.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CReal.java @@ -3,10 +3,10 @@ import com.nedap.archie.base.Interval; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CString.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CString.java index b542c69e0..240deb813 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CString.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CString.java @@ -8,10 +8,10 @@ import org.openehr.utils.message.I18n; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CTerminologyCode.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CTerminologyCode.java index 9675c86c7..b62bbbb36 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CTerminologyCode.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CTerminologyCode.java @@ -18,10 +18,10 @@ import org.openehr.utils.message.I18n; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.net.URI; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/CTime.java b/aom/src/main/java/com/nedap/archie/aom/primitives/CTime.java index e400494f5..e6db9b377 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/CTime.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/CTime.java @@ -5,11 +5,11 @@ import com.nedap.archie.xml.adapters.TimeXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.temporal.TemporalAccessor; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/aom/primitives/ConstraintStatus.java b/aom/src/main/java/com/nedap/archie/aom/primitives/ConstraintStatus.java index 8a8d102ae..1f7fee9ee 100644 --- a/aom/src/main/java/com/nedap/archie/aom/primitives/ConstraintStatus.java +++ b/aom/src/main/java/com/nedap/archie/aom/primitives/ConstraintStatus.java @@ -2,7 +2,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnumValue; public enum ConstraintStatus { @JsonProperty("required") diff --git a/aom/src/main/java/com/nedap/archie/aom/rmoverlay/RmAttributeVisibility.java b/aom/src/main/java/com/nedap/archie/aom/rmoverlay/RmAttributeVisibility.java index 4e4405480..503ee917f 100644 --- a/aom/src/main/java/com/nedap/archie/aom/rmoverlay/RmAttributeVisibility.java +++ b/aom/src/main/java/com/nedap/archie/aom/rmoverlay/RmAttributeVisibility.java @@ -4,7 +4,7 @@ import com.nedap.archie.base.terminology.TerminologyCode; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; public class RmAttributeVisibility extends ArchetypeModelObject { diff --git a/aom/src/main/java/com/nedap/archie/aom/rmoverlay/VisibilityType.java b/aom/src/main/java/com/nedap/archie/aom/rmoverlay/VisibilityType.java index 77c6cf14d..a5c4b8dc5 100644 --- a/aom/src/main/java/com/nedap/archie/aom/rmoverlay/VisibilityType.java +++ b/aom/src/main/java/com/nedap/archie/aom/rmoverlay/VisibilityType.java @@ -2,8 +2,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; +import jakarta.xml.bind.annotation.XmlEnum; +import jakarta.xml.bind.annotation.XmlEnumValue; public enum VisibilityType { @JsonProperty("hide") diff --git a/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerm.java b/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerm.java index 547fce7c4..9e96191d9 100644 --- a/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerm.java +++ b/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerm.java @@ -6,13 +6,13 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.nedap.archie.aom.ArchetypeModelObject; -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.XmlTransient; -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.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.Collection; import java.util.HashMap; import java.util.Map; diff --git a/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerminology.java b/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerminology.java index f98591233..a58856426 100644 --- a/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerminology.java +++ b/aom/src/main/java/com/nedap/archie/aom/terminology/ArchetypeTerminology.java @@ -8,11 +8,11 @@ import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.net.URI; import java.util.ArrayList; import java.util.HashSet; diff --git a/aom/src/main/java/com/nedap/archie/aom/terminology/ValueSet.java b/aom/src/main/java/com/nedap/archie/aom/terminology/ValueSet.java index b510df522..4b75bfcde 100644 --- a/aom/src/main/java/com/nedap/archie/aom/terminology/ValueSet.java +++ b/aom/src/main/java/com/nedap/archie/aom/terminology/ValueSet.java @@ -2,9 +2,9 @@ import com.nedap.archie.aom.ArchetypeModelObject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; diff --git a/aom/src/main/java/com/nedap/archie/serializer/adl/jackson/ArchetypeTerminologyMixin.java b/aom/src/main/java/com/nedap/archie/serializer/adl/jackson/ArchetypeTerminologyMixin.java index 778094d5e..897176904 100644 --- a/aom/src/main/java/com/nedap/archie/serializer/adl/jackson/ArchetypeTerminologyMixin.java +++ b/aom/src/main/java/com/nedap/archie/serializer/adl/jackson/ArchetypeTerminologyMixin.java @@ -5,8 +5,8 @@ import com.nedap.archie.aom.terminology.ArchetypeTerm; import com.nedap.archie.aom.terminology.ValueSet; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; import java.net.URI; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/AbstractIntervalAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/AbstractIntervalAdapter.java index fe560b8ed..3ddc9762f 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/AbstractIntervalAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/AbstractIntervalAdapter.java @@ -2,7 +2,7 @@ import com.nedap.archie.base.Interval; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Created by pieter.bos on 28/07/16. diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/ArchetypeTerminologyAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/ArchetypeTerminologyAdapter.java index 2028d6275..33263e444 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/ArchetypeTerminologyAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/ArchetypeTerminologyAdapter.java @@ -8,7 +8,7 @@ import com.nedap.archie.xml.types.TermBindingSet; import com.nedap.archie.xml.types.XmlArchetypeTerminology; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/DateTimeXmlAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/DateTimeXmlAdapter.java index 89608430e..960dec828 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/DateTimeXmlAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/DateTimeXmlAdapter.java @@ -3,7 +3,7 @@ import com.nedap.archie.datetime.DateTimeParsers; import com.nedap.archie.datetime.DateTimeSerializerFormatters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDateTime; import java.time.OffsetDateTime; import java.time.ZonedDateTime; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/DateXmlAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/DateXmlAdapter.java index 449ca8382..75b1c4a97 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/DateXmlAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/DateXmlAdapter.java @@ -3,7 +3,7 @@ import com.nedap.archie.datetime.DateTimeParsers; import com.nedap.archie.datetime.DateTimeSerializerFormatters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.LocalDate; import java.time.YearMonth; import java.time.temporal.Temporal; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/DurationXmlAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/DurationXmlAdapter.java index af08ff6d1..3fba58178 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/DurationXmlAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/DurationXmlAdapter.java @@ -3,7 +3,7 @@ import com.nedap.archie.datetime.DateTimeParsers; import com.nedap.archie.datetime.DateTimeSerializerFormatters; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.temporal.TemporalAmount; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/RMOverlayXmlAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/RMOverlayXmlAdapter.java index 9665967f6..f32f0b38b 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/RMOverlayXmlAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/RMOverlayXmlAdapter.java @@ -5,7 +5,7 @@ import com.nedap.archie.xml.types.XmlRmAttributeVisibility; import com.nedap.archie.xml.types.XmlRmOverlay; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/ResourceDescriptionAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/ResourceDescriptionAdapter.java index 5e4ee9b70..657152e51 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/ResourceDescriptionAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/ResourceDescriptionAdapter.java @@ -5,7 +5,7 @@ import com.nedap.archie.xml.types.XmlResourceDescription; import com.nedap.archie.xml.types.XmlResourceDescriptionItem; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.net.URISyntaxException; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/TermMappingMatchAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/TermMappingMatchAdapter.java index 15114f1e7..2740a6586 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/TermMappingMatchAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/TermMappingMatchAdapter.java @@ -1,8 +1,8 @@ package com.nedap.archie.xml.adapters; -import javax.xml.bind.DataBindingException; -import javax.xml.bind.ValidationException; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.DataBindingException; +import jakarta.xml.bind.ValidationException; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; public class TermMappingMatchAdapter extends XmlAdapter { @Override diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/TimeXmlAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/TimeXmlAdapter.java index 6f7d77674..6041d22d3 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/TimeXmlAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/TimeXmlAdapter.java @@ -3,7 +3,7 @@ import com.nedap.archie.adlparser.treewalkers.TemporalConstraintParser; import com.nedap.archie.datetime.DateTimeParsers; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; import java.time.temporal.TemporalAccessor; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/adapters/TranslationDetailsAdapter.java b/aom/src/main/java/com/nedap/archie/xml/adapters/TranslationDetailsAdapter.java index b1936a1dd..454f0b5f1 100644 --- a/aom/src/main/java/com/nedap/archie/xml/adapters/TranslationDetailsAdapter.java +++ b/aom/src/main/java/com/nedap/archie/xml/adapters/TranslationDetailsAdapter.java @@ -3,7 +3,7 @@ import com.nedap.archie.aom.TranslationDetails; import com.nedap.archie.xml.types.XmlTranslationDetails; -import javax.xml.bind.annotation.adapters.XmlAdapter; +import jakarta.xml.bind.annotation.adapters.XmlAdapter; /** * Created by pieter.bos on 01/08/16. diff --git a/aom/src/main/java/com/nedap/archie/xml/types/CodeDefinitionSet.java b/aom/src/main/java/com/nedap/archie/xml/types/CodeDefinitionSet.java index b646c5cf5..801a63fa9 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/CodeDefinitionSet.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/CodeDefinitionSet.java @@ -3,11 +3,11 @@ import com.nedap.archie.aom.ArchetypeModelObject; import com.nedap.archie.aom.terminology.ArchetypeTerm; -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 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 java.util.List; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/types/StringDictionaryItem.java b/aom/src/main/java/com/nedap/archie/xml/types/StringDictionaryItem.java index cc3f46804..1f5bb2326 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/StringDictionaryItem.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/StringDictionaryItem.java @@ -1,10 +1,10 @@ package com.nedap.archie.xml.types; -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 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; /** * Created by pieter.bos on 22/07/16. diff --git a/aom/src/main/java/com/nedap/archie/xml/types/TermBindingSet.java b/aom/src/main/java/com/nedap/archie/xml/types/TermBindingSet.java index fac413491..c80aee72d 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/TermBindingSet.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/TermBindingSet.java @@ -1,10 +1,10 @@ package com.nedap.archie.xml.types; -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 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 java.util.List; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlArchetypeTerminology.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlArchetypeTerminology.java index b80b2cac5..78efb91c5 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlArchetypeTerminology.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlArchetypeTerminology.java @@ -2,11 +2,11 @@ import com.nedap.archie.aom.terminology.ValueSet; -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 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 java.util.ArrayList; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescription.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescription.java index caa8a5e9a..3052fa982 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescription.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescription.java @@ -3,10 +3,10 @@ import com.nedap.archie.aom.ResourceDescriptionItem; import com.nedap.archie.base.terminology.TerminologyCode; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescriptionItem.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescriptionItem.java index 0d33a2bc6..9b2523aec 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescriptionItem.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlResourceDescriptionItem.java @@ -2,10 +2,10 @@ import com.nedap.archie.base.terminology.TerminologyCode; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; /** diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlRmAttributeVisibility.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlRmAttributeVisibility.java index 69bfa00c7..0f0063f89 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlRmAttributeVisibility.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlRmAttributeVisibility.java @@ -4,10 +4,10 @@ import com.nedap.archie.base.terminology.TerminologyCode; import javax.annotation.Nullable; -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 jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlType; @XmlType(name="RM_ATTRIBUTE_VISIBILITY") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlRmOverlay.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlRmOverlay.java index f2b7d2c0a..745cbfe76 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlRmOverlay.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlRmOverlay.java @@ -1,9 +1,9 @@ package com.nedap.archie.xml.types; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; diff --git a/aom/src/main/java/com/nedap/archie/xml/types/XmlTranslationDetails.java b/aom/src/main/java/com/nedap/archie/xml/types/XmlTranslationDetails.java index f47840f97..3636044f4 100644 --- a/aom/src/main/java/com/nedap/archie/xml/types/XmlTranslationDetails.java +++ b/aom/src/main/java/com/nedap/archie/xml/types/XmlTranslationDetails.java @@ -2,10 +2,10 @@ import com.nedap.archie.base.terminology.TerminologyCode; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; @XmlAccessorType(XmlAccessType.FIELD) diff --git a/archie-utils/src/main/java/com/nedap/archie/xml/JAXBUtil.java b/archie-utils/src/main/java/com/nedap/archie/xml/JAXBUtil.java index 8b2c4c8ee..e14753d73 100644 --- a/archie-utils/src/main/java/com/nedap/archie/xml/JAXBUtil.java +++ b/archie-utils/src/main/java/com/nedap/archie/xml/JAXBUtil.java @@ -11,8 +11,8 @@ import com.nedap.archie.rminfo.ArchieRMInfoLookup; import com.nedap.archie.xml.types.XmlResourceDescriptionItem; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.ArrayList; import java.util.List; diff --git a/base/src/main/java/com/nedap/archie/base/Cardinality.java b/base/src/main/java/com/nedap/archie/base/Cardinality.java index ba066142c..43e0aff06 100644 --- a/base/src/main/java/com/nedap/archie/base/Cardinality.java +++ b/base/src/main/java/com/nedap/archie/base/Cardinality.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.google.common.base.Joiner; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/base/src/main/java/com/nedap/archie/base/Interval.java b/base/src/main/java/com/nedap/archie/base/Interval.java index 91c44649a..521b5036a 100644 --- a/base/src/main/java/com/nedap/archie/base/Interval.java +++ b/base/src/main/java/com/nedap/archie/base/Interval.java @@ -5,11 +5,11 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.time.temporal.TemporalAmount; import java.util.Objects; diff --git a/base/src/main/java/com/nedap/archie/base/terminology/TerminologyCode.java b/base/src/main/java/com/nedap/archie/base/terminology/TerminologyCode.java index 152439510..63fe749b9 100644 --- a/base/src/main/java/com/nedap/archie/base/terminology/TerminologyCode.java +++ b/base/src/main/java/com/nedap/archie/base/terminology/TerminologyCode.java @@ -6,10 +6,10 @@ import com.nedap.archie.base.OpenEHRBase; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.net.URI; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/build.gradle b/build.gradle index 88079ddd9..52e38b6cc 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,14 @@ +buildscript { + repositories { + maven { + url = uri("https://plugins.gradle.org/m2/") + } + } + dependencies { + classpath("com.netflix.nebula:gradle-jakartaee-migration-plugin:0.17.0") + } +} + repositories { mavenCentral() } @@ -30,10 +41,6 @@ apply from: "${gradleScriptDir}/publish-maven.gradle" subprojects { apply plugin: 'java-library' - // plugins { - // id 'com.github.ben-manes.versions' version '0.13.0' - // } - sourceCompatibility = '1.8' targetCompatibility = '1.8' @@ -74,9 +81,8 @@ subprojects { implementation 'org.apache.commons:commons-lang3:3.12.0' //java 10 no longer has these included by default, so explicit dependency is needed. - api 'javax.xml.bind:jaxb-api:2.3.1' - api 'com.sun.xml.bind:jaxb-core:2.3.0.1' - runtimeOnly 'com.sun.xml.bind:jaxb-impl:2.3.3' + api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + runtimeOnly 'com.sun.xml.bind:jaxb-impl:4.0.3' api 'javax.activation:activation:1.1.1' api 'org.threeten:threeten-extra:1.7.2' diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Archetyped.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Archetyped.java index 5c9ed3d6c..129ea6166 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Archetyped.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Archetyped.java @@ -6,10 +6,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAudit.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAudit.java index 5295fcd32..3f469349f 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAudit.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAudit.java @@ -5,10 +5,10 @@ import com.nedap.archie.rm.datavalues.encapsulated.DvEncapsulated; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAuditDetails.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAuditDetails.java index 54d7e4061..4503831c4 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAuditDetails.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/FeederAuditDetails.java @@ -9,10 +9,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Link.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Link.java index 3f7e9bf78..9638c6bee 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Link.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Link.java @@ -4,9 +4,9 @@ import com.nedap.archie.rm.datavalues.DvEHRURI; import com.nedap.archie.rm.datavalues.DvText; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Locatable.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Locatable.java index a06c3401e..b375b71f9 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Locatable.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Locatable.java @@ -9,7 +9,7 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Pathable.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Pathable.java index 9e623c048..2514d998e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Pathable.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/Pathable.java @@ -12,10 +12,10 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.Collection; import java.util.List; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/TemplateId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/TemplateId.java index a08c5fc8a..7b6094aac 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/TemplateId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/archetyped/TemplateId.java @@ -2,9 +2,9 @@ import com.nedap.archie.rm.support.identification.ObjectId; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 01/03/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Contribution.java b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Contribution.java index fdf7256ad..f19cdf233 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Contribution.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Contribution.java @@ -6,9 +6,9 @@ import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rm.support.identification.ObjectRef; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/ImportedVersion.java b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/ImportedVersion.java index 461e83deb..63da1fd26 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/ImportedVersion.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/ImportedVersion.java @@ -8,7 +8,7 @@ import com.nedap.archie.rminfo.RMProperty; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/OriginalVersion.java b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/OriginalVersion.java index c57381741..5c0327b5b 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/OriginalVersion.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/OriginalVersion.java @@ -14,9 +14,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Version.java b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Version.java index 82de0b8f4..90c3cd35a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Version.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/Version.java @@ -11,10 +11,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/VersionedObject.java b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/VersionedObject.java index 8ad17baf6..0df6127ba 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/VersionedObject.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/changecontrol/VersionedObject.java @@ -7,10 +7,10 @@ import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rm.support.identification.ObjectRef; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Action.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Action.java index fbfed962c..74b928dea 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Action.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Action.java @@ -17,7 +17,7 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Activity.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Activity.java index b07c861ca..85584c15a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Activity.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Activity.java @@ -10,12 +10,12 @@ import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/AdminEntry.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/AdminEntry.java index edc950e93..799b234a4 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/AdminEntry.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/AdminEntry.java @@ -14,10 +14,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/CareEntry.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/CareEntry.java index 27830c0cc..666eb79dd 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/CareEntry.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/CareEntry.java @@ -14,10 +14,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Composition.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Composition.java index 7ec80e755..26e269a0a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Composition.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Composition.java @@ -12,10 +12,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/ContentItem.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/ContentItem.java index 7445c4114..fc4825169 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/ContentItem.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/ContentItem.java @@ -5,9 +5,9 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Entry.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Entry.java index 148c17236..aa94e1934 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Entry.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Entry.java @@ -17,10 +17,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Evaluation.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Evaluation.java index 4b2f582e5..9a93128b7 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Evaluation.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Evaluation.java @@ -14,10 +14,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/EventContext.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/EventContext.java index 81186ee30..03f298122 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/EventContext.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/EventContext.java @@ -10,10 +10,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Instruction.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Instruction.java index 5b6feba44..933934972 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Instruction.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Instruction.java @@ -19,11 +19,11 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -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.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/InstructionDetails.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/InstructionDetails.java index 6a3ed03ea..9e67163e5 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/InstructionDetails.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/InstructionDetails.java @@ -7,10 +7,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/IsmTransition.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/IsmTransition.java index b91638a44..e71f18cf7 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/IsmTransition.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/IsmTransition.java @@ -7,10 +7,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Observation.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Observation.java index d4932332e..3e2c52336 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Observation.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Observation.java @@ -15,10 +15,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Section.java b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Section.java index b8c2eaa02..63dd21845 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Section.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/composition/Section.java @@ -10,10 +10,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Cluster.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Cluster.java index 4132d31b6..418846ac2 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Cluster.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Cluster.java @@ -8,10 +8,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java index 2d8c18cf7..7d12dd296 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Element.java @@ -13,7 +13,7 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Event.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Event.java index 0b1884cf3..964cafece 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Event.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Event.java @@ -8,9 +8,9 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.time.Duration; import java.time.OffsetDateTime; import java.util.List; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/History.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/History.java index 06ab9664e..6f78d93c2 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/History.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/History.java @@ -11,9 +11,9 @@ import com.nedap.archie.rminfo.Invariant; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/IntervalEvent.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/IntervalEvent.java index 9acd6c0d2..0c12b0740 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/IntervalEvent.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/IntervalEvent.java @@ -13,10 +13,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Item.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Item.java index 513c8054c..3bc56f6ab 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Item.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/Item.java @@ -5,9 +5,9 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java index a4a13791a..742c6509f 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemList.java @@ -8,10 +8,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemSingle.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemSingle.java index 0e2ace0e1..b7ff5f330 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemSingle.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemSingle.java @@ -11,10 +11,10 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemStructure.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemStructure.java index 05d05403d..bdd1f4019 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemStructure.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemStructure.java @@ -9,9 +9,9 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java index 4dab153df..9a219ef42 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTable.java @@ -10,10 +10,10 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTree.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTree.java index bcd6d9ffe..75d548f61 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTree.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/ItemTree.java @@ -8,10 +8,10 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/PointEvent.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/PointEvent.java index cdf5ce3a2..26e62b878 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/PointEvent.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datastructures/PointEvent.java @@ -10,9 +10,9 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datatypes/CodePhrase.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datatypes/CodePhrase.java index 52ccb676b..1f26f3eac 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datatypes/CodePhrase.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datatypes/CodePhrase.java @@ -6,10 +6,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DataValue.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DataValue.java index b9efbad31..9fa46f941 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DataValue.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DataValue.java @@ -2,9 +2,9 @@ import com.nedap.archie.rm.RMObject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * TODO: check if we can add common fields here for convenience, for example value and magnitude diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvBoolean.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvBoolean.java index a2a447039..9a8d8362f 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvBoolean.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvBoolean.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.datavalues; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvCodedText.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvCodedText.java index 315ed7852..9edc6f1e0 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvCodedText.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvCodedText.java @@ -4,10 +4,10 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvEHRURI.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvEHRURI.java index 96bf809da..41dcce1c6 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvEHRURI.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvEHRURI.java @@ -3,9 +3,9 @@ import com.nedap.archie.definitions.OpenEhrDefinitions; import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.net.URI; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvIdentifier.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvIdentifier.java index f26428b41..61cf82f1e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvIdentifier.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvIdentifier.java @@ -4,9 +4,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvParagraph.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvParagraph.java index e355f4106..3d0dd4130 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvParagraph.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvParagraph.java @@ -7,9 +7,9 @@ import com.nedap.archie.rminfo.Invariant; import com.nedap.archie.rmutil.InvariantUtil; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvState.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvState.java index fb6ac9e19..43c78f498 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvState.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvState.java @@ -2,10 +2,10 @@ import com.nedap.archie.rminfo.RMProperty; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvText.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvText.java index e739ea74d..98d659a52 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvText.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvText.java @@ -6,9 +6,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvURI.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvURI.java index 539e32580..271811dab 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvURI.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/DvURI.java @@ -2,9 +2,9 @@ import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.net.URI; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/TermMapping.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/TermMapping.java index 02adb4e07..8b5394903 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/TermMapping.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/TermMapping.java @@ -8,10 +8,10 @@ import com.nedap.archie.xml.adapters.TermMappingMatchAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -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.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.util.HashSet; import java.util.Objects; import java.util.Set; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvEncapsulated.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvEncapsulated.java index 59a4423f5..2d378b7e3 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvEncapsulated.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvEncapsulated.java @@ -6,9 +6,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvMultimedia.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvMultimedia.java index 761cb4501..117ef5894 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvMultimedia.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvMultimedia.java @@ -8,11 +8,11 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.util.Arrays; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvParsable.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvParsable.java index d4f956513..205e79e03 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvParsable.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/encapsulated/DvParsable.java @@ -7,9 +7,9 @@ import org.apache.commons.io.Charsets; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.nio.charset.StandardCharsets; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAbsoluteQuantity.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAbsoluteQuantity.java index 50d6bf147..bbbea62d8 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAbsoluteQuantity.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAbsoluteQuantity.java @@ -3,7 +3,7 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAmount.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAmount.java index 587519f3b..7b419e20a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAmount.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvAmount.java @@ -5,7 +5,7 @@ import com.nedap.archie.rminfo.Invariant; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvCount.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvCount.java index 47d7e5df5..687c97f8a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvCount.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvCount.java @@ -3,9 +3,9 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvInterval.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvInterval.java index 1d139ccc0..3814a3405 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvInterval.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvInterval.java @@ -6,11 +6,11 @@ import com.nedap.archie.rminfo.Invariant; import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdered.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdered.java index b82776d1b..8cd6d0710 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdered.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdered.java @@ -8,11 +8,11 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdinal.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdinal.java index 6bb268f80..20da83bc4 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdinal.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvOrdinal.java @@ -4,9 +4,9 @@ import com.nedap.archie.rm.datavalues.SingleValuedDataValue; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvProportion.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvProportion.java index 00d9dbd7b..fa683102e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvProportion.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvProportion.java @@ -5,9 +5,9 @@ import com.nedap.archie.rminfo.Invariant; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantified.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantified.java index 6b2e64e8e..92548e3cd 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantified.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantified.java @@ -9,7 +9,7 @@ import com.nedap.archie.rminfo.RMProperty; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.Arrays; import java.util.HashSet; import java.util.List; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantity.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantity.java index 15cc226fa..f54d9801a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantity.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvQuantity.java @@ -4,10 +4,10 @@ import com.nedap.archie.rm.datatypes.CodePhrase; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvScale.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvScale.java index 0b1e9df5d..9f870688e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvScale.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/DvScale.java @@ -4,9 +4,9 @@ import com.nedap.archie.rm.datavalues.SingleValuedDataValue; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/ReferenceRange.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/ReferenceRange.java index 8bd953043..a706966f2 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/ReferenceRange.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/ReferenceRange.java @@ -4,9 +4,9 @@ import com.nedap.archie.rm.datavalues.DvText; import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDate.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDate.java index b23ae2ac0..97ab06953 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDate.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDate.java @@ -13,11 +13,11 @@ import com.nedap.archie.xml.adapters.DateXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalDate; import java.time.temporal.ChronoField; import java.time.temporal.Temporal; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDateTime.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDateTime.java index 71789878c..3cf9a970a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDateTime.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDateTime.java @@ -15,11 +15,11 @@ import com.nedap.archie.xml.adapters.DateTimeXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalDateTime; import java.time.ZoneOffset; import java.time.ZonedDateTime; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDuration.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDuration.java index 825694482..f72d95ffe 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDuration.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvDuration.java @@ -10,11 +10,11 @@ import com.nedap.archie.xml.adapters.DurationXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.temporal.TemporalAmount; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTemporal.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTemporal.java index 4d76ffa12..6aa2d1d7b 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTemporal.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTemporal.java @@ -6,9 +6,9 @@ import com.nedap.archie.rm.datavalues.quantity.ReferenceRange; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTime.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTime.java index d86b596c5..82f32eae7 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTime.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/quantity/datetime/DvTime.java @@ -13,11 +13,11 @@ import com.nedap.archie.xml.adapters.TimeXmlAdapter; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -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.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import java.time.LocalTime; import java.time.temporal.TemporalAccessor; import java.util.List; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvGeneralTimeSpecification.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvGeneralTimeSpecification.java index e32e2699d..d173d69cb 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvGeneralTimeSpecification.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvGeneralTimeSpecification.java @@ -1,6 +1,6 @@ package com.nedap.archie.rm.datavalues.timespecification; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvPeriodicTimeSpecification.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvPeriodicTimeSpecification.java index d68572c71..b9a259d89 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvPeriodicTimeSpecification.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvPeriodicTimeSpecification.java @@ -2,10 +2,10 @@ import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvTimeSpecification.java b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvTimeSpecification.java index 82746f589..932131090 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvTimeSpecification.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/datavalues/timespecification/DvTimeSpecification.java @@ -3,9 +3,9 @@ import com.nedap.archie.rm.datavalues.DataValue; import com.nedap.archie.rm.datavalues.encapsulated.DvParsable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Actor.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Actor.java index ee1d31f8a..ffcbcd349 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Actor.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Actor.java @@ -4,9 +4,9 @@ import com.nedap.archie.rm.datavalues.DvText; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Address.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Address.java index cb39e9db1..e8c55bbda 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Address.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Address.java @@ -6,10 +6,10 @@ import com.nedap.archie.rm.datavalues.DvText; import com.nedap.archie.rminfo.RMPropertyIgnore; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Agent.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Agent.java index d70be6820..39f91caad 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Agent.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Agent.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.demographic; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Capability.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Capability.java index 474b98761..d5bfcf0b1 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Capability.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Capability.java @@ -6,10 +6,10 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDate; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Contact.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Contact.java index 4b8ac5a34..4d8114843 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Contact.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Contact.java @@ -7,11 +7,11 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDate; import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Group.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Group.java index 894bcc37c..a6df3929d 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Group.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Group.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.demographic; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Organisation.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Organisation.java index 8a7ce464b..388c82a39 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Organisation.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Organisation.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.demographic; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Party.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Party.java index 45daebeb3..04f363fe0 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Party.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Party.java @@ -8,11 +8,11 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -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.XmlType; +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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyIdentity.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyIdentity.java index 075a7d522..3ff1d148d 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyIdentity.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyIdentity.java @@ -6,10 +6,10 @@ import com.nedap.archie.rm.datavalues.DvText; import com.nedap.archie.rminfo.RMPropertyIgnore; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyRelationship.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyRelationship.java index bb34290bf..a237f9b04 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyRelationship.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/PartyRelationship.java @@ -7,10 +7,10 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDate; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Person.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Person.java index 7af431b4b..a1535ef83 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Person.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Person.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.demographic; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Role.java b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Role.java index 47ad0db48..804f3b118 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Role.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/demographic/Role.java @@ -5,10 +5,10 @@ import com.nedap.archie.rm.datavalues.quantity.datetime.DvDate; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/directory/Folder.java b/openehr-rm/src/main/java/com/nedap/archie/rm/directory/Folder.java index 0d03a42e0..14f56fa39 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/directory/Folder.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/directory/Folder.java @@ -10,10 +10,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/directory/VersionedFolder.java b/openehr-rm/src/main/java/com/nedap/archie/rm/directory/VersionedFolder.java index daa5bf94f..36c3b9f4a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/directory/VersionedFolder.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/directory/VersionedFolder.java @@ -6,7 +6,7 @@ import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rm.support.identification.ObjectRef; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/Ehr.java b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/Ehr.java index 3889fa98a..3d7911699 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/Ehr.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/Ehr.java @@ -9,7 +9,7 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.*; +import jakarta.xml.bind.annotation.*; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrAccess.java b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrAccess.java index c32b08862..4326991c7 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrAccess.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrAccess.java @@ -8,9 +8,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrStatus.java b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrStatus.java index a522973db..cf67d71b9 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrStatus.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/EhrStatus.java @@ -15,10 +15,10 @@ import com.nedap.archie.rminfo.RMProperty; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrAccess.java b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrAccess.java index 44f515b38..bddc4dbba 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrAccess.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrAccess.java @@ -6,9 +6,9 @@ import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rm.support.identification.ObjectRef; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrStatus.java b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrStatus.java index 2b3dc0792..dfef6f78c 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrStatus.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/ehr/VersionedEhrStatus.java @@ -6,9 +6,9 @@ import com.nedap.archie.rm.support.identification.ObjectId; import com.nedap.archie.rm.support.identification.ObjectRef; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Attestation.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Attestation.java index ce0ed2daa..b394bb1d5 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Attestation.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Attestation.java @@ -10,10 +10,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/AuditDetails.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/AuditDetails.java index f0dd68309..6318b22a6 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/AuditDetails.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/AuditDetails.java @@ -9,10 +9,10 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Participation.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Participation.java index 71105ef87..157065c4d 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Participation.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/Participation.java @@ -9,9 +9,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyIdentified.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyIdentified.java index 4d406928d..0f2714674 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyIdentified.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyIdentified.java @@ -6,9 +6,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyProxy.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyProxy.java index 01f0e756a..1c2b951fa 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyProxy.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyProxy.java @@ -4,10 +4,10 @@ import com.nedap.archie.rm.support.identification.PartyRef; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyRelated.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyRelated.java index 5a659d722..e42889007 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyRelated.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartyRelated.java @@ -7,9 +7,9 @@ import com.nedap.archie.rmutil.InvariantUtil; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartySelf.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartySelf.java index 690f3a931..f8884ad78 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartySelf.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/PartySelf.java @@ -3,9 +3,9 @@ import com.nedap.archie.rm.support.identification.PartyRef; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 01/03/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistory.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistory.java index 11c3ab2e6..a0ae8826d 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistory.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistory.java @@ -2,9 +2,9 @@ import com.nedap.archie.rm.RMObject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistoryItem.java b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistoryItem.java index 9750ec402..37417fbfd 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistoryItem.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/generic/RevisionHistoryItem.java @@ -3,10 +3,10 @@ import com.nedap.archie.rm.RMObject; import com.nedap.archie.rm.support.identification.ObjectVersionId; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/integration/GenericEntry.java b/openehr-rm/src/main/java/com/nedap/archie/rm/integration/GenericEntry.java index 876fed19b..5e96d74d5 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/integration/GenericEntry.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/integration/GenericEntry.java @@ -10,7 +10,7 @@ import com.nedap.archie.rm.support.identification.UIDBasedId; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/package-info.java b/openehr-rm/src/main/java/com/nedap/archie/rm/package-info.java index cdf3564be..a78de758e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/package-info.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/package-info.java @@ -2,6 +2,6 @@ /** * */ -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.openehr.org/v1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://schemas.openehr.org/v1", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED) package com.nedap.archie.rm; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/security/AccessControlSettings.java b/openehr-rm/src/main/java/com/nedap/archie/rm/security/AccessControlSettings.java index d8f799024..92ad046ce 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/security/AccessControlSettings.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/security/AccessControlSettings.java @@ -2,7 +2,7 @@ import com.nedap.archie.rm.RMObject; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; /** * Abstract class for access control settings. To be implemented by users of this library. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ArchetypeID.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ArchetypeID.java index 635b488d0..ca12a85ec 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ArchetypeID.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ArchetypeID.java @@ -5,7 +5,7 @@ import com.nedap.archie.rminfo.RMPropertyIgnore; import javax.annotation.Nullable; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Unmarshaller; import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/GenericId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/GenericId.java index 6fccaae56..ae948005e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/GenericId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/GenericId.java @@ -1,9 +1,9 @@ package com.nedap.archie.rm.support.identification; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/HierObjectId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/HierObjectId.java index 1927e30b3..f87820846 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/HierObjectId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/HierObjectId.java @@ -4,9 +4,9 @@ * Created by pieter.bos on 08/07/16. */ -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "HIER_OBJECT_ID") diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/LocatableRef.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/LocatableRef.java index 235e86115..f2dd6c991 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/LocatableRef.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/LocatableRef.java @@ -1,8 +1,8 @@ package com.nedap.archie.rm.support.identification; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectId.java index e73f310bb..3713ec637 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectId.java @@ -2,10 +2,10 @@ import com.nedap.archie.rm.RMObject; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -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.XmlType; import java.util.Objects; /** diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectRef.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectRef.java index e68969791..49dde6e96 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectRef.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectRef.java @@ -3,9 +3,9 @@ import com.nedap.archie.rm.RMObject; import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; import java.util.Objects; import java.util.regex.Pattern; diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectVersionId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectVersionId.java index 2e99835ef..d5971bd7e 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectVersionId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/ObjectVersionId.java @@ -3,10 +3,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.nedap.archie.rminfo.RMProperty; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 08/07/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/PartyRef.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/PartyRef.java index 90edc3a43..d4b1a8814 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/PartyRef.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/PartyRef.java @@ -2,9 +2,9 @@ import com.nedap.archie.rminfo.Invariant; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 01/03/16. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/TerminologyId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/TerminologyId.java index ab954f282..bba7a026a 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/TerminologyId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/TerminologyId.java @@ -2,10 +2,10 @@ import com.fasterxml.jackson.annotation.JsonIgnore; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 04/11/15. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/UIDBasedId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/UIDBasedId.java index 4b9c25dee..65ecd731b 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/UIDBasedId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/UIDBasedId.java @@ -5,10 +5,10 @@ import com.nedap.archie.rminfo.Invariant; import javax.annotation.Nullable; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; /** * Created by pieter.bos on 04/11/15. diff --git a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/VersionTreeId.java b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/VersionTreeId.java index d7f502359..6fef1f895 100644 --- a/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/VersionTreeId.java +++ b/openehr-rm/src/main/java/com/nedap/archie/rm/support/identification/VersionTreeId.java @@ -6,7 +6,7 @@ import com.nedap.archie.rminfo.Invariant; import com.nedap.archie.rminfo.RMProperty; -import javax.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlTransient; import java.util.Objects; import java.util.regex.Pattern; diff --git a/openehr-rm/src/test/java/com/nedap/archie/rm/composition/CompositionTest.java b/openehr-rm/src/test/java/com/nedap/archie/rm/composition/CompositionTest.java index 355475bce..371b87199 100644 --- a/openehr-rm/src/test/java/com/nedap/archie/rm/composition/CompositionTest.java +++ b/openehr-rm/src/test/java/com/nedap/archie/rm/composition/CompositionTest.java @@ -6,8 +6,8 @@ import com.nedap.archie.xml.JAXBUtil; import org.junit.Test; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.IOException; import java.io.StringWriter; diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/OpenEHRTerminologyAccess.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/OpenEHRTerminologyAccess.java index 0f6d5ec8c..86cbcf810 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/OpenEHRTerminologyAccess.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/OpenEHRTerminologyAccess.java @@ -4,9 +4,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.nedap.archie.terminology.openehr.*; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Unmarshaller; import java.io.IOException; import java.io.InputStream; import java.util.Collections; diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Code.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Code.java index f168f70f8..2209a1da7 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Code.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Code.java @@ -8,14 +8,14 @@ package com.nedap.archie.terminology.openehr; -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.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.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; /** diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Codeset.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Codeset.java index ea2ad2b53..91534e68d 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Codeset.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Codeset.java @@ -10,15 +10,15 @@ 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; /** diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Concept.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Concept.java index dbbc2369e..91dfe4dc8 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Concept.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Concept.java @@ -9,12 +9,12 @@ package com.nedap.archie.terminology.openehr; import java.math.BigInteger; -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 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; /** diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Group.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Group.java index d35962352..d4f14a599 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Group.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Group.java @@ -10,13 +10,13 @@ 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 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; /** diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/ObjectFactory.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/ObjectFactory.java index cab8310eb..610da7b7d 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/ObjectFactory.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/ObjectFactory.java @@ -8,7 +8,7 @@ package com.nedap.archie.terminology.openehr; -import javax.xml.bind.annotation.XmlRegistry; +import jakarta.xml.bind.annotation.XmlRegistry; /** diff --git a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Terminology.java b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Terminology.java index 512a7fd37..51b63ff4e 100644 --- a/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Terminology.java +++ b/openehr-terminology/src/main/java/com/nedap/archie/terminology/openehr/Terminology.java @@ -10,15 +10,15 @@ 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; /** diff --git a/tools/src/main/java/com/nedap/archie/query/RMQueryContext.java b/tools/src/main/java/com/nedap/archie/query/RMQueryContext.java index 939a9a1d3..0589784e8 100644 --- a/tools/src/main/java/com/nedap/archie/query/RMQueryContext.java +++ b/tools/src/main/java/com/nedap/archie/query/RMQueryContext.java @@ -8,10 +8,10 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import javax.xml.bind.Binder; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Binder; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; diff --git a/tools/src/main/java/com/nedap/archie/rules/evaluation/RuleEvaluation.java b/tools/src/main/java/com/nedap/archie/rules/evaluation/RuleEvaluation.java index 8215353f7..84307d3b0 100644 --- a/tools/src/main/java/com/nedap/archie/rules/evaluation/RuleEvaluation.java +++ b/tools/src/main/java/com/nedap/archie/rules/evaluation/RuleEvaluation.java @@ -14,7 +14,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import javax.xml.xpath.XPathExpressionException; import java.util.ArrayList; import java.util.HashMap; diff --git a/tools/src/test/java/com/nedap/archie/xml/JAXBAOMRoundTripTest.java b/tools/src/test/java/com/nedap/archie/xml/JAXBAOMRoundTripTest.java index aada07bd4..ce0b707b2 100644 --- a/tools/src/test/java/com/nedap/archie/xml/JAXBAOMRoundTripTest.java +++ b/tools/src/test/java/com/nedap/archie/xml/JAXBAOMRoundTripTest.java @@ -10,9 +10,9 @@ import org.junit.Test; import org.openehr.referencemodels.BuiltinReferenceModels; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.io.StringReader; import java.io.StringWriter; diff --git a/tools/src/test/java/com/nedap/archie/xml/JAXBAOMTest.java b/tools/src/test/java/com/nedap/archie/xml/JAXBAOMTest.java index c9ecd7f49..16862250e 100644 --- a/tools/src/test/java/com/nedap/archie/xml/JAXBAOMTest.java +++ b/tools/src/test/java/com/nedap/archie/xml/JAXBAOMTest.java @@ -23,9 +23,9 @@ import org.junit.Before; import org.junit.Test; -import javax.xml.bind.Marshaller; -import javax.xml.bind.PropertyException; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.PropertyException; +import jakarta.xml.bind.Unmarshaller; import java.io.StringReader; import java.io.StringWriter; import java.time.temporal.TemporalAmount; diff --git a/tools/src/test/java/com/nedap/archie/xml/JAXBRMRoundTripTest.java b/tools/src/test/java/com/nedap/archie/xml/JAXBRMRoundTripTest.java index d75cc8d55..ab605137b 100644 --- a/tools/src/test/java/com/nedap/archie/xml/JAXBRMRoundTripTest.java +++ b/tools/src/test/java/com/nedap/archie/xml/JAXBRMRoundTripTest.java @@ -16,7 +16,7 @@ import org.junit.Test; import org.openehr.referencemodels.BuiltinReferenceModels; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.Marshaller; import java.io.StringReader; import java.io.StringWriter; import java.time.LocalDate; diff --git a/tools/src/test/java/com/nedap/archie/xml/JAXBRMTest.java b/tools/src/test/java/com/nedap/archie/xml/JAXBRMTest.java index 66dd2505f..182cdc5e7 100644 --- a/tools/src/test/java/com/nedap/archie/xml/JAXBRMTest.java +++ b/tools/src/test/java/com/nedap/archie/xml/JAXBRMTest.java @@ -6,8 +6,8 @@ import org.junit.Test; import org.threeten.extra.PeriodDuration; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; import java.io.StringReader; import java.io.StringWriter; import java.time.Period;