diff --git a/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle
index 34c143413..0cc87b858 100644
--- a/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle
+++ b/Src/java/buildSrc/src/main/groovy/cql.java-conventions.gradle
@@ -33,7 +33,8 @@ dependencies {
 
     // These are JAXB dependencies excluded because the libraries need to work
     // on Android. But for test purposes we use them pretty much everywhere.
-    testRuntimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    testRuntimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2'
+    testRuntimeOnly 'org.eclipse.parsson:parsson:1.1.5'
     testRuntimeOnly 'xpp3:xpp3:1.1.4c'
 }
 
diff --git a/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle b/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle
index fadb08ec5..4bcd34fac 100644
--- a/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle
+++ b/Src/java/buildSrc/src/main/groovy/cql.xjc-conventions.gradle
@@ -7,19 +7,20 @@ configurations {
 }
 
 dependencies {
-    xjc 'org.jvnet.jaxb2_commons:jaxb2-basics-ant:0.13.1'
-    xjc 'org.jvnet.jaxb2_commons:jaxb2-basics:0.13.1'
-    xjc 'org.jvnet.jaxb2_commons:jaxb2-fluent-api:3.0'
+    xjc 'codes.rafael.jaxb2_commons:jaxb2-basics-ant:3.0.0'
+    xjc 'codes.rafael.jaxb2_commons:jaxb2-basics:3.0.0'
+    xjc 'codes.rafael.jaxb2_commons:jaxb2-fluent-api:3.0.0'
     // Eclipse has taken over all Java EE reference components
     // https://www.infoworld.com/article/3310042/eclipse-takes-over-all-java-ee-reference-components.html
     // https://wiki.eclipse.org/Jakarta_EE_Maven_Coordinates
-    xjc 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
-    xjc 'org.glassfish.jaxb:jaxb-xjc:2.4.0-b180830.0438'
-    xjc 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    xjc 'org.glassfish.jaxb:jaxb-xjc:3.0.2'
+    xjc 'org.glassfish.jaxb:jaxb-runtime:4.0.3'
+    xjc 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.2'
     xjc 'org.slf4j:slf4j-simple:1.7.36'
 
-    api 'org.jvnet.jaxb2_commons:jaxb2-basics-runtime:0.13.1'
-    api 'jakarta.xml.bind:jakarta.xml.bind-api:2.3.3'
+    api 'codes.rafael.jaxb2_commons:jaxb2-basics-runtime:3.0.0'
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
 }
 
 ext.xjc = [
@@ -66,4 +67,4 @@ sourceSets {
 
 clean {
     delete xjc.destDir
-}
\ No newline at end of file
+}
diff --git a/Src/java/cqf-fhir-npm/build.gradle b/Src/java/cqf-fhir-npm/build.gradle
index 89422d105..e67e2b295 100644
--- a/Src/java/cqf-fhir-npm/build.gradle
+++ b/Src/java/cqf-fhir-npm/build.gradle
@@ -5,6 +5,7 @@ plugins {
 dependencies {
     implementation project(':cql-to-elm')
     implementation project(':cqf-fhir')
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation 'com.google.code.gson:gson:2.9.1'
     implementation 'org.apache.commons:commons-compress:1.24.0'
 }
diff --git a/Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmModelInfoProvider.java b/Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmModelInfoProvider.java
index 4914c7535..092c1b97d 100644
--- a/Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmModelInfoProvider.java
+++ b/Src/java/cqf-fhir-npm/src/main/java/org/cqframework/fhir/npm/NpmModelInfoProvider.java
@@ -1,10 +1,6 @@
 package org.cqframework.fhir.npm;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
+import jakarta.xml.bind.JAXB;
 import org.hl7.cql.model.ModelIdentifier;
 import org.hl7.cql.model.ModelInfoProvider;
 import org.hl7.elm_modelinfo.r1.ModelInfo;
@@ -12,7 +8,10 @@
 import org.hl7.fhir.r5.model.Library;
 import org.hl7.fhir.utilities.npm.NpmPackage;
 
-import javax.xml.bind.JAXB;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
 
 /**
  * Provides a model info provider that can resolve CQL model info from an Npm package
diff --git a/Src/java/cql-to-elm-cli/build.gradle b/Src/java/cql-to-elm-cli/build.gradle
index b292cb04c..bd95c0f1a 100644
--- a/Src/java/cql-to-elm-cli/build.gradle
+++ b/Src/java/cql-to-elm-cli/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation project(':model-jaxb')
     implementation project(':elm-jaxb')
     implementation 'net.sf.jopt-simple:jopt-simple:4.7'
-    runtimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:2.7.7'
+    runtimeOnly 'org.eclipse.persistence:org.eclipse.persistence.moxy:4.0.1'
     runtimeOnly 'xpp3:xpp3_min:1.1.4c'
     runtimeOnly 'xmlpull:xmlpull:1.1.3.1'
 
diff --git a/Src/java/cql-to-elm/build.gradle b/Src/java/cql-to-elm/build.gradle
index d735a4058..df5ad7223 100644
--- a/Src/java/cql-to-elm/build.gradle
+++ b/Src/java/cql-to-elm/build.gradle
@@ -20,7 +20,8 @@ dependencies {
     }
 
     implementation 'org.apache.commons:commons-text:1.10.0'
-    implementation 'com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2'
+    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.13.2'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
 
     testImplementation project(':elm-jackson')
     testImplementation project(':model-jackson')
diff --git a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.java b/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.java
index 6891a5ecf..73f01e684 100644
--- a/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.java
+++ b/Src/java/cql-to-elm/src/main/java/org/cqframework/cql/cql2elm/preprocessor/CqlPreprocessorElmCommonVisitor.java
@@ -19,14 +19,13 @@
 import org.hl7.cql_annotations.r1.Tag;
 import org.hl7.elm.r1.*;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import javax.xml.namespace.QName;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Stack;
-import java.util.stream.Collectors;
 
 /**
  * Common functionality used by {@link CqlPreprocessorVisitor} and {@link Cql2ElmVisitor}
diff --git a/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/CommentTests.java b/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/CommentTests.java
index 033caa6ca..6977eea91 100644
--- a/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/CommentTests.java
+++ b/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/CommentTests.java
@@ -10,7 +10,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBElement;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/TranslationTests.java b/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/TranslationTests.java
index 6490086a0..2d0c2a297 100644
--- a/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/TranslationTests.java
+++ b/Src/java/cql-to-elm/src/test/java/org/cqframework/cql/cql2elm/TranslationTests.java
@@ -7,7 +7,7 @@
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/Src/java/elm-fhir/build.gradle b/Src/java/elm-fhir/build.gradle
index b2eff4222..e53733c21 100644
--- a/Src/java/elm-fhir/build.gradle
+++ b/Src/java/elm-fhir/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     implementation project(':engine')
     implementation project(":engine-fhir")
     implementation "org.mapstruct:mapstruct:${mapstructVersion}"
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
 
     testImplementation project(':quick')
     testImplementation "org.reflections:reflections:0.10.2"
diff --git a/Src/java/elm-fhir/src/main/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessor.java b/Src/java/elm-fhir/src/main/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessor.java
index d450d9a9c..cc0094979 100644
--- a/Src/java/elm-fhir/src/main/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessor.java
+++ b/Src/java/elm-fhir/src/main/java/org/cqframework/cql/elm/requirements/fhir/DataRequirementsProcessor.java
@@ -30,8 +30,7 @@
 import org.opencds.cqf.cql.engine.fhir.converter.FhirTypeConverter;
 import org.opencds.cqf.cql.engine.fhir.converter.FhirTypeConverterFactory;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.namespace.QName;
+import jakarta.xml.bind.JAXBElement;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.ZonedDateTime;
diff --git a/Src/java/elm-jackson/build.gradle b/Src/java/elm-jackson/build.gradle
index 86932ef88..7475ef9b6 100644
--- a/Src/java/elm-jackson/build.gradle
+++ b/Src/java/elm-jackson/build.gradle
@@ -7,7 +7,7 @@ dependencies {
     api project(':elm')
     implementation 'org.apache.commons:commons-text:1.10.0'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
-    implementation 'com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2'
+    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2'
     // needs javax.json.JsonException when using SAXUnmarshaller.getNewXMLReader
     implementation 'org.glassfish:javax.json:1.0.4'
 }
diff --git a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonLibraryReader.java b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonLibraryReader.java
index a399636ed..3f724caae 100644
--- a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonLibraryReader.java
+++ b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonLibraryReader.java
@@ -1,17 +1,8 @@
 package org.cqframework.cql.elm.serializing.jackson;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 import org.cqframework.cql.elm.serializing.ElmLibraryReader;
 import org.cqframework.cql.elm.serializing.LibraryWrapper;
-import org.cqframework.cql.elm.serializing.jackson.mixins.CqlToElmBaseMixIn;
-import org.cqframework.cql.elm.serializing.jackson.mixins.TypeSpecifierMixIn;
-import org.hl7.cql_annotations.r1.CqlToElmBase;
 import org.hl7.elm.r1.Library;
-import org.hl7.elm.r1.TypeSpecifier;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonMapper.java b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonMapper.java
index 713ff58ad..cf8c61461 100644
--- a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonMapper.java
+++ b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmJsonMapper.java
@@ -5,7 +5,7 @@
 import com.fasterxml.jackson.databind.MapperFeature;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.json.JsonMapper;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 import org.cqframework.cql.elm.serializing.jackson.mixins.CqlToElmBaseMixIn;
 import org.cqframework.cql.elm.serializing.jackson.mixins.TrackableMixIn;
 import org.cqframework.cql.elm.serializing.jackson.mixins.TypeSpecifierMixIn;
@@ -20,7 +20,7 @@ public class ElmJsonMapper {
             .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
             .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL)
             .defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
-            .addModule(new JaxbAnnotationModule())
+            .addModule(new JakartaXmlBindAnnotationModule())
             .addMixIn(Trackable.class, TrackableMixIn.class)
             .addMixIn(TypeSpecifier.class, TypeSpecifierMixIn.class)
             .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class)
diff --git a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlLibraryReader.java b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlLibraryReader.java
index 89b3bff9f..ad3fbf461 100644
--- a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlLibraryReader.java
+++ b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlLibraryReader.java
@@ -1,17 +1,7 @@
 package org.cqframework.cql.elm.serializing.jackson;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 import org.cqframework.cql.elm.serializing.ElmLibraryReader;
-import org.cqframework.cql.elm.serializing.jackson.mixins.CqlToElmBaseMixIn;
-import org.cqframework.cql.elm.serializing.jackson.mixins.TypeSpecifierMixIn;
-import org.hl7.cql_annotations.r1.CqlToElmBase;
 import org.hl7.elm.r1.Library;
-import org.hl7.elm.r1.TypeSpecifier;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlMapper.java b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlMapper.java
index 5902054a7..e8f255c20 100644
--- a/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlMapper.java
+++ b/Src/java/elm-jackson/src/main/java/org/cqframework/cql/elm/serializing/jackson/ElmXmlMapper.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 import org.cqframework.cql.elm.serializing.jackson.mixins.CqlToElmBaseMixIn;
 import org.cqframework.cql.elm.serializing.jackson.mixins.TrackableMixIn;
 import org.cqframework.cql.elm.serializing.jackson.mixins.TypeSpecifierMixIn;
@@ -31,7 +31,7 @@ public class ElmXmlMapper {
             .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
             .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL)
             .defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL))
-            .addModule(new JaxbAnnotationModule())
+            .addModule(new JakartaXmlBindAnnotationModule())
             .addMixIn(Trackable.class, TrackableMixIn.class)
             .addMixIn(TypeSpecifier.class, TypeSpecifierMixIn.class)
             .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class)
diff --git a/Src/java/elm-jaxb/build.gradle b/Src/java/elm-jaxb/build.gradle
index deeea8646..1440e8336 100644
--- a/Src/java/elm-jaxb/build.gradle
+++ b/Src/java/elm-jaxb/build.gradle
@@ -4,5 +4,7 @@ plugins {
 
 dependencies {
     api project(':elm')
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.json:jakarta.json-api:2.1.3'
     implementation 'org.apache.commons:commons-text:1.10.0'
 }
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryReader.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryReader.java
index f2a1dc603..058ea501c 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryReader.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryReader.java
@@ -1,18 +1,18 @@
 package org.cqframework.cql.elm.serializing.jaxb;
 
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.PropertyException;
+import jakarta.xml.bind.Unmarshaller;
+import jakarta.xml.bind.ValidationEvent;
+import jakarta.xml.bind.ValidationEventHandler;
 import org.cqframework.cql.elm.serializing.ElmLibraryReader;
 import org.hl7.elm.r1.Library;
 
-import javax.xml.bind.*;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
-import java.net.MalformedURLException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.URL;
 
 public class ElmJsonLibraryReader implements ElmLibraryReader {
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryWriter.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryWriter.java
index e341e4629..dfd4332de 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryWriter.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonLibraryWriter.java
@@ -4,9 +4,9 @@
 import org.hl7.elm.r1.Library;
 import org.hl7.elm.r1.ObjectFactory;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.Writer;
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonMapper.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonMapper.java
index db95f0904..2c1207471 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonMapper.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmJsonMapper.java
@@ -3,8 +3,8 @@
 import org.hl7.cql_annotations.r1.CqlToElmBase;
 import org.hl7.elm.r1.Library;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 public class ElmJsonMapper {
 
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryReader.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryReader.java
index d8281a30e..88a837234 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryReader.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryReader.java
@@ -3,9 +3,9 @@
 import org.cqframework.cql.elm.serializing.ElmLibraryReader;
 import org.hl7.elm.r1.Library;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import javax.xml.transform.Source;
 import java.io.File;
 import java.io.IOException;
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryWriter.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryWriter.java
index e0868b0ca..0b5167e15 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryWriter.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlLibraryWriter.java
@@ -4,9 +4,9 @@
 import org.hl7.elm.r1.Library;
 import org.hl7.elm.r1.ObjectFactory;
 
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.PropertyException;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.PropertyException;
 import java.io.*;
 
 public class ElmXmlLibraryWriter implements ElmLibraryWriter {
diff --git a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlMapper.java b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlMapper.java
index 97b811220..422b5dd62 100644
--- a/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlMapper.java
+++ b/Src/java/elm-jaxb/src/main/java/org/cqframework/cql/elm/serializing/jaxb/ElmXmlMapper.java
@@ -3,8 +3,8 @@
 import org.hl7.cql_annotations.r1.CqlToElmBase;
 import org.hl7.elm.r1.Library;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
 
 public class ElmXmlMapper {
 
diff --git a/Src/java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties b/Src/java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties
+++ b/Src/java/elm-jaxb/src/main/resources/org/cqframework/cql/elm/serializing/jaxb/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/elm-test/src/test/java/org/cqframework/cql/elm/ElmDeserializeTests.java b/Src/java/elm-test/src/test/java/org/cqframework/cql/elm/ElmDeserializeTests.java
index 7b9832fd5..2c1988f1a 100644
--- a/Src/java/elm-test/src/test/java/org/cqframework/cql/elm/ElmDeserializeTests.java
+++ b/Src/java/elm-test/src/test/java/org/cqframework/cql/elm/ElmDeserializeTests.java
@@ -7,7 +7,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 
 import org.cqframework.cql.cql2elm.CqlTranslator;
 import org.cqframework.cql.cql2elm.CqlCompilerOptions;
diff --git a/Src/java/elm/build.gradle b/Src/java/elm/build.gradle
index bc1b7c62e..d099d113c 100644
--- a/Src/java/elm/build.gradle
+++ b/Src/java/elm/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 dependencies {
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation project(':model')
 }
 
diff --git a/Src/java/elm/src/main/java/org/cqframework/cql/elm/tracking/Trackable.java b/Src/java/elm/src/main/java/org/cqframework/cql/elm/tracking/Trackable.java
index 2ea4e330d..1d4cdd771 100644
--- a/Src/java/elm/src/main/java/org/cqframework/cql/elm/tracking/Trackable.java
+++ b/Src/java/elm/src/main/java/org/cqframework/cql/elm/tracking/Trackable.java
@@ -2,7 +2,7 @@
 
 import org.hl7.cql.model.DataType;
 
-import javax.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.XmlTransient;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
diff --git a/Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java b/Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java
index e955375fb..97935a845 100644
--- a/Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java
+++ b/Src/java/elm/src/main/java/org/hl7/cql_annotations/r1/package-info.java
@@ -1,6 +1,6 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:cql-annotations:r1", xmlns = {
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:cql-annotations:r1", xmlns = {
         @XmlNs(prefix="a", namespaceURI = "urn:hl7-org:cql-annotations:r1")},
-        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+        elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.hl7.cql_annotations.r1;
 
-import javax.xml.bind.annotation.XmlNs;
\ No newline at end of file
+import jakarta.xml.bind.annotation.XmlNs;
\ No newline at end of file
diff --git a/Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java b/Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java
index ecc7fe531..3122f1eb2 100644
--- a/Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java
+++ b/Src/java/elm/src/main/java/org/hl7/elm/r1/package-info.java
@@ -1,4 +1,4 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm:r1", xmlns = {
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm:r1", xmlns = {
         @XmlNs(prefix = "", namespaceURI = "urn:hl7-org:elm:r1"),
         @XmlNs(prefix = "t", namespaceURI = "urn:hl7-org:elm-types:r1"),
         @XmlNs(prefix = "xsi", namespaceURI = "http://www.w3.org/2001/XMLSchema-instance"),
@@ -7,7 +7,7 @@
         @XmlNs(prefix = "qdm43", namespaceURI = "urn:healthit-gov:qdm:v4_3"),
         @XmlNs(prefix = "qdm53", namespaceURI = "urn:healthit-gov:qdm:v5_3"),
         @XmlNs(prefix = "a", namespaceURI = "urn:hl7-org:cql-annotations:r1")},
-        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+        elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.hl7.elm.r1;
 
-import javax.xml.bind.annotation.XmlNs;
\ No newline at end of file
+import jakarta.xml.bind.annotation.XmlNs;
\ No newline at end of file
diff --git a/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties b/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties
+++ b/Src/java/elm/src/main/resources/org/hl7/cql_annotations/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties b/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties
+++ b/Src/java/elm/src/main/resources/org/hl7/elm/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/engine-fhir/build.gradle b/Src/java/engine-fhir/build.gradle
index 6ba8344e0..c5732fdf8 100644
--- a/Src/java/engine-fhir/build.gradle
+++ b/Src/java/engine-fhir/build.gradle
@@ -9,6 +9,7 @@ dependencies {
     api 'org.apache.commons:commons-text:1.10.0'
     api 'xpp3:xpp3_min:1.1.4c'
     api 'xmlpull:xmlpull:1.1.3.1'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.0'
     testImplementation project(':cql-to-elm')
     testImplementation project(':model-jackson')
diff --git a/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java b/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java
index 4933db4b6..bb99e22b4 100644
--- a/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java
+++ b/Src/java/engine-fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java
@@ -9,7 +9,7 @@
 import java.time.ZoneOffset;
 import java.util.*;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 
 import org.hl7.elm.r1.Library;
 import org.fhir.ucum.UcumException;
diff --git a/Src/java/engine-fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java b/Src/java/engine-fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java
index 9fc7bcd8a..b29938b61 100644
--- a/Src/java/engine-fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java
+++ b/Src/java/engine-fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java
@@ -16,7 +16,7 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.File;
 import java.io.IOException;
 import java.net.URLDecoder;
diff --git a/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties b/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties
+++ b/Src/java/engine-fhir/src/test/resources/org/hl7/fhirpath/tests/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/engine/build.gradle b/Src/java/engine/build.gradle
index e8e2b94d3..8229aa29b 100644
--- a/Src/java/engine/build.gradle
+++ b/Src/java/engine/build.gradle
@@ -7,6 +7,8 @@ dependencies {
     api 'org.fhir:ucum:1.0.3'
     api 'xpp3:xpp3_min:1.1.4c'
     api 'xmlpull:xmlpull:1.1.3.1'
+    api 'com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation project(path: ':elm')
     implementation project(path: ':cql-to-elm')
 
diff --git a/Src/java/engine/src/main/cql-lm/schema/elm/binding.xjb b/Src/java/engine/src/main/cql-lm/schema/elm/binding.xjb
index 6e27c1a61..1e425e461 100644
--- a/Src/java/engine/src/main/cql-lm/schema/elm/binding.xjb
+++ b/Src/java/engine/src/main/cql-lm/schema/elm/binding.xjb
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <jaxb:bindings
-    xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
+    xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb" xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:annox="http://annox.dev.java.net"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jaxb https://jakarta.ee/xml/ns/jaxb/bindingschema_2_0.xsd"
     jaxb:extensionBindingPrefixes="xjc annox"
     version="2.1">
     <jaxb:bindings schemaLocation="library.xsd" node="//xs:complexType" multiple="true" >
diff --git a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/package-info.java b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/package-info.java
index 23385f61a..33b8b057d 100644
--- a/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/package-info.java
+++ b/Src/java/engine/src/main/java/org/opencds/cqf/cql/engine/elm/executing/package-info.java
@@ -1,11 +1,11 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm:r1", xmlns = {
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm:r1", xmlns = {
         @XmlNs(prefix = "", namespaceURI = "urn:hl7-org:elm:r1"),
         @XmlNs(prefix = "t", namespaceURI = "urn:hl7-org:elm-types:r1"),
         @XmlNs(prefix = "xsi", namespaceURI = "http://www.w3.org/2001/XMLSchema-instance"),
         @XmlNs(prefix = "xsd", namespaceURI = "http://www.w3.org/2001/XMLSchema"),
         @XmlNs(prefix = "quick", namespaceURI = "http://hl7.org/fhir"),
         @XmlNs(prefix = "a", namespaceURI = "urn:hl7-org:cql-annotations:r1")},
-        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+        elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.opencds.cqf.cql.engine.elm.executing;
 
-import javax.xml.bind.annotation.XmlNs;
+import jakarta.xml.bind.annotation.XmlNs;
diff --git a/Src/java/model-jackson/build.gradle b/Src/java/model-jackson/build.gradle
index bf6d81ff1..79ed1b4e3 100644
--- a/Src/java/model-jackson/build.gradle
+++ b/Src/java/model-jackson/build.gradle
@@ -5,7 +5,7 @@ plugins {
 dependencies {
     api project(':model')
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.2'
-    implementation 'com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.15.2'
+    implementation 'com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.15.2'
 
     testImplementation project(":quick")
     testImplementation project(":qdm")
diff --git a/Src/java/model-jackson/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jackson/XmlModelInfoReader.java b/Src/java/model-jackson/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jackson/XmlModelInfoReader.java
index c9c7165ab..4f38201fe 100644
--- a/Src/java/model-jackson/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jackson/XmlModelInfoReader.java
+++ b/Src/java/model-jackson/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jackson/XmlModelInfoReader.java
@@ -8,7 +8,7 @@
 import com.fasterxml.jackson.dataformat.xml.XmlFactory;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
 import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator;
-import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
+import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationModule;
 import org.hl7.elm_modelinfo.r1.ModelInfo;
 import org.hl7.elm_modelinfo.r1.TypeInfo;
 import org.hl7.elm_modelinfo.r1.TypeSpecifier;
@@ -33,7 +33,7 @@ public class XmlModelInfoReader implements ModelInfoReader {
             .enable(SerializationFeature.INDENT_OUTPUT)
             .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
             .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL)
-            .addModule(new JaxbAnnotationModule())
+            .addModule(new JakartaXmlBindAnnotationModule())
             .addMixIn(TypeInfo.class, TypeInfoMixIn.class)
             .addMixIn(TypeSpecifier.class, TypeSpecifierMixIn.class)
             .build();
diff --git a/Src/java/model-jaxb/build.gradle b/Src/java/model-jaxb/build.gradle
index 5bb1dfda5..c49f3b777 100644
--- a/Src/java/model-jaxb/build.gradle
+++ b/Src/java/model-jaxb/build.gradle
@@ -3,5 +3,7 @@ plugins {
 }
 
 dependencies {
+    api 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
+    api 'jakarta.json:jakarta.json-api:2.1.3'
     implementation project(':model')
 }
diff --git a/Src/java/model-jaxb/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/XmlModelInfoReader.java b/Src/java/model-jaxb/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/XmlModelInfoReader.java
index 31e9288eb..9d1b5f475 100644
--- a/Src/java/model-jaxb/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/XmlModelInfoReader.java
+++ b/Src/java/model-jaxb/src/main/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/XmlModelInfoReader.java
@@ -3,7 +3,7 @@
 import org.hl7.elm_modelinfo.r1.ModelInfo;
 import org.hl7.elm_modelinfo.r1.serializing.ModelInfoReader;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 import java.io.*;
 import java.net.URI;
 import java.net.URL;
diff --git a/Src/java/model-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties b/Src/java/model-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/model-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties
+++ b/Src/java/model-jaxb/src/main/resources/java/org/hl7/elm_modelinfo/r1/serializing/jaxb/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/model/build.gradle b/Src/java/model/build.gradle
index 9f83b90ac..916041374 100644
--- a/Src/java/model/build.gradle
+++ b/Src/java/model/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     implementation 'org.apache.commons:commons-text:1.10.0'
+	 implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
 }
 
 generateSources {
@@ -15,4 +16,4 @@ generateSources {
             arg(line: "${xjc.args} -npa")
         }
     }
-}
\ No newline at end of file
+}
diff --git a/Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.java b/Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.java
index 6260a4d8f..0a9587e20 100644
--- a/Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.java
+++ b/Src/java/model/src/main/java/org/hl7/cql/model/ModelIdentifier.java
@@ -4,7 +4,7 @@
 import org.jvnet.jaxb2_commons.locator.ObjectLocator;
 import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
 
-import javax.xml.bind.annotation.*;
+import jakarta.xml.bind.annotation.*;
 
 @XmlAccessorType(XmlAccessType.FIELD)
 @XmlType(name = "ModelIdentifier", namespace = "urn:hl7-org:model")
diff --git a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java b/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java
index 227addf83..f06b8bb59 100644
--- a/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java
+++ b/Src/java/model/src/main/java/org/hl7/elm_modelinfo/r1/package-info.java
@@ -5,11 +5,11 @@
 // Generated on: 2015.01.05 at 11:42:59 AM MST 
 //
 
-@javax.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm-modelinfo:r1", xmlns = {
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "urn:hl7-org:elm-modelinfo:r1", xmlns = {
         @XmlNs(prefix = "", namespaceURI = "urn:hl7-org:elm-modelinfo:r1"),
         @XmlNs(prefix = "xsi", namespaceURI = "http://www.w3.org/2001/XMLSchema-instance"),
         @XmlNs(prefix = "xsd", namespaceURI = "http://www.w3.org/2001/XMLSchema")},
-        elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+        elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.hl7.elm_modelinfo.r1;
 
-import javax.xml.bind.annotation.XmlNs;
\ No newline at end of file
+import jakarta.xml.bind.annotation.XmlNs;
\ No newline at end of file
diff --git a/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties b/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties
index 5837a4c25..b48bb869b 100644
--- a/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties
+++ b/Src/java/model/src/main/resources/org/hl7/elm_modelinfo/r1/jaxb.properties
@@ -1 +1 @@
-javax.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
+jakarta.xml.bind.context.factory=org.eclipse.persistence.jaxb.JAXBContextFactory
\ No newline at end of file
diff --git a/Src/java/model/src/test/java/org/hl7/cql/model/ModelInfoComparer.java b/Src/java/model/src/test/java/org/hl7/cql/model/ModelInfoComparer.java
index 46dd767ca..5519b25b2 100644
--- a/Src/java/model/src/test/java/org/hl7/cql/model/ModelInfoComparer.java
+++ b/Src/java/model/src/test/java/org/hl7/cql/model/ModelInfoComparer.java
@@ -3,7 +3,7 @@
 import org.hl7.elm_modelinfo.r1.*;
 import org.testng.annotations.Test;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 
 import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.*;
diff --git a/Src/java/qdm/build.gradle b/Src/java/qdm/build.gradle
index 8740cbda9..43ae0ca0b 100644
--- a/Src/java/qdm/build.gradle
+++ b/Src/java/qdm/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 dependencies {
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation project(':elm')
     implementation project(':model')
 }
diff --git a/Src/java/quick/build.gradle b/Src/java/quick/build.gradle
index 4f3dad17e..915af4064 100644
--- a/Src/java/quick/build.gradle
+++ b/Src/java/quick/build.gradle
@@ -4,6 +4,7 @@ plugins {
 }
 
 dependencies {
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation project(':elm')
     implementation project(':model')
 }
diff --git a/Src/java/quick/schema/v1.4/quick-binding.xjb b/Src/java/quick/schema/v1.4/quick-binding.xjb
index 6f6c088b8..67ea3ea52 100644
--- a/Src/java/quick/schema/v1.4/quick-binding.xjb
+++ b/Src/java/quick/schema/v1.4/quick-binding.xjb
@@ -1,7 +1,7 @@
-<bindings xmlns="http://java.sun.com/xml/ns/jaxb"
+<bindings xmlns="https://jakarta.ee/xml/ns/jaxb"
           xmlns:xsi="http://www.w3.org/2000/10/XMLSchema-instance"
           xmlns:xs="http://www.w3.org/2001/XMLSchema"
-          version="2.1">
+          version="3.0">
     <bindings schemaLocation="fhir-xhtml.xsd" version="1.0">
         <bindings node="//xs:element[@name='bdo']">
             <bindings node=".//xs:attribute[@name='lang']">
diff --git a/Src/java/tools/xsd-to-modelinfo/build.gradle b/Src/java/tools/xsd-to-modelinfo/build.gradle
index bdc474883..02f3182a3 100644
--- a/Src/java/tools/xsd-to-modelinfo/build.gradle
+++ b/Src/java/tools/xsd-to-modelinfo/build.gradle
@@ -9,6 +9,7 @@ application {
 
 dependencies {
     implementation project(':model')
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.1'
     implementation 'net.sf.jopt-simple:jopt-simple:4.7'
     implementation 'org.apache.ws.xmlschema:xmlschema-core:2.2.5'
     implementation 'org.apache.ws.xmlschema:xmlschema-walker:2.2.5'
diff --git a/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/Main.java b/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/Main.java
index df58c805e..b182b5ff2 100644
--- a/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/Main.java
+++ b/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/Main.java
@@ -8,10 +8,10 @@
 import org.hl7.elm_modelinfo.r1.ModelInfo;
 import org.hl7.elm_modelinfo.r1.ObjectFactory;
 
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.JAXB;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
 import javax.xml.transform.stream.StreamSource;
 import java.io.*;
 
diff --git a/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java b/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java
index 0243ef5f5..b665af14c 100644
--- a/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java
+++ b/Src/java/tools/xsd-to-modelinfo/src/main/java/org/cqframework/cql/tools/xsd2modelinfo/ModelImporter.java
@@ -4,7 +4,7 @@
 import org.hl7.cql.model.*;
 import org.hl7.elm_modelinfo.r1.*;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 import javax.xml.namespace.QName;
 import java.io.IOException;
 import java.io.InputStream;