diff --git a/jOOQ-codegen/src/main/java/module-info.java b/jOOQ-codegen/src/main/java/module-info.java
index 78842c0dcc..88b118c6c2 100644
--- a/jOOQ-codegen/src/main/java/module-info.java
+++ b/jOOQ-codegen/src/main/java/module-info.java
@@ -9,7 +9,7 @@ module org.jooq.codegen {
     // JAXB is used optionally for loading a variety of XML content, including
     // - Settings (org.jooq.conf)
     // - InformationSchema (org.jooq.util.xml.jaxb)
-    requires static java.xml.bind;
+    requires static jakarta.xml.bind;
 
     exports org.jooq.codegen;
     exports org.jooq.codegen.example;
diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
index 08051f8430..2c76239c08 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -88,7 +88,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.jooq.AggregateFunction;
 import org.jooq.Catalog;
diff --git a/jOOQ-meta/src/main/java/module-info.java b/jOOQ-meta/src/main/java/module-info.java
index e028f52510..a5a827034e 100644
--- a/jOOQ-meta/src/main/java/module-info.java
+++ b/jOOQ-meta/src/main/java/module-info.java
@@ -9,7 +9,7 @@ module org.jooq.meta {
     // JAXB is used optionally for loading a variety of XML content, including
     // - Settings (org.jooq.conf)
     // - InformationSchema (org.jooq.util.xml.jaxb)
-    requires static java.xml.bind;
+    requires static jakarta.xml.bind;
 
     exports org.jooq.meta;
     exports org.jooq.meta.cubrid;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java
index b0c9db7ef7..e7d20b82d3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CatalogMappingType.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java
index 4da4da3982..f0a40ef0fb 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CommentType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java
index a640dca48b..d455094da5 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Configuration.java
@@ -2,13 +2,13 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java
index 4ad57a5005..c488f52f11 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/CustomType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
index cbf02533d3..1f319b0c19 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Database.java
@@ -5,13 +5,13 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlList;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java
index 86ad5783cd..bf2fd1edc7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableDefinitionType.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java
index 9adc3bdac1..718762c1b8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EmbeddableField.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java
index c864078934..e297701982 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/EnumType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java
index 828e454962..2c7641ec61 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedType.java
@@ -2,12 +2,12 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedTypeObjectType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedTypeObjectType.java
index cdbba164d8..2b2db50155 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedTypeObjectType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ForcedTypeObjectType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
index 5921816617..0b231738e1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generate.java
@@ -2,12 +2,12 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedAnnotationType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedAnnotationType.java
index 95739c57d8..9958b7dc49 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedAnnotationType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedAnnotationType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedSerialVersionUID.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedSerialVersionUID.java
index 234c534919..85dbc112d0 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedSerialVersionUID.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/GeneratedSerialVersionUID.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java
index 6d52adf790..8c9aaa2524 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Generator.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
index c082c4b84f..e2e4234cda 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Jdbc.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java
index d0404dba70..2be303504c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/LambdaConverter.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Logging.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Logging.java
index b2bb5dddce..b5401d1ae6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Logging.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Logging.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java
index c404ac9ce0..e2c0432b3d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherRule.java
@@ -2,12 +2,12 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherTransformType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherTransformType.java
index 2abc51d681..6031a437a7 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherTransformType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatcherTransformType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
index 3da1ba8ea8..1015e54eab 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Matchers.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java
index 19db5182ae..4345882c73 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersCatalogType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java
index 0e46901da5..44866a936c 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEmbeddableType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java
index a4831b50a6..a6777396e6 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersEnumType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java
index a2916287c7..b47931ee14 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersFieldType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java
index 4c50187a25..0dda2bed44 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersRoutineType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java
index 92c0a47180..c84b6c9778 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSchemaType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java
index 196a2de017..a48bc0658b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersSequenceType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java
index 27c6115cb0..b054874f9e 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/MatchersTableType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Nullability.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Nullability.java
index a0624a200a..3df116d0f8 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Nullability.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Nullability.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ObjectFactory.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ObjectFactory.java
index e740391b99..5c3b363d1d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ObjectFactory.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/ObjectFactory.java
@@ -1,7 +1,7 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/OnError.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/OnError.java
index 1492805647..3e4a8004bf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/OnError.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/OnError.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java
index fcbe56f941..826dd8acd1 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Property.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/RegexFlag.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/RegexFlag.java
index 1e046b4815..bb9ea8a04a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/RegexFlag.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/RegexFlag.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java
index 4c243d694b..26cbb4bc4b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SchemaMappingType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java
index 3105114b24..6fb7880a7d 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Strategy.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java
index 7c237d0771..3ebdd0558a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticForeignKeyType.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java
index 0730cd1129..83aecdfc80 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticIdentityType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java
index 6970db7fdd..eacf71a995 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticObjectsType.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java
index 05bd01473a..3233576e56 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticPrimaryKeyType.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java
index 8239c8d03b..2b1c0c2c46 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyColumnType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java
index 40ffdaea79..17a2cb1c50 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticReadonlyRowidType.java
@@ -2,10 +2,10 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java
index f9d550c6e6..ad7ec2f61a 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticUniqueKeyType.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java
index 62a4c1b91f..abb92eecbf 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/SyntheticViewType.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java
index b4a79b8e3e..c7abd9c60b 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/Target.java
@@ -2,11 +2,11 @@
 package org.jooq.meta.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/VisibilityModifier.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/VisibilityModifier.java
index 65dca97c6d..7ea7c549b3 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/VisibilityModifier.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/VisibilityModifier.java
@@ -1,8 +1,8 @@
 
 package org.jooq.meta.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java
index d1c8c4f4b8..4fcba39b00 100644
--- a/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java
+++ b/jOOQ-meta/src/main/java/org/jooq/meta/jaxb/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.16.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-codegen-3.16.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jooq.meta.jaxb;
diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml
index 6c8e5cf636..8ecc9fc682 100644
--- a/jOOQ/pom.xml
+++ b/jOOQ/pom.xml
@@ -105,8 +105,8 @@
         <!-- The dependency can cause trouble in older JDKs, so it needs to be
              excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         
         <dependency>
diff --git a/jOOQ/src/main/java/module-info.java b/jOOQ/src/main/java/module-info.java
index 61ef2db071..86721b621c 100644
--- a/jOOQ/src/main/java/module-info.java
+++ b/jOOQ/src/main/java/module-info.java
@@ -12,7 +12,7 @@ module org.jooq {
     // JAXB is used optionally for loading a variety of XML content, including
     // - Settings (org.jooq.conf)
     // - InformationSchema (org.jooq.util.xml.jaxb)
-    requires static java.xml.bind;
+    requires static jakarta.xml.bind;
 
     // The DefaultRecordMapper makes use of JavaBeans utilities, including:
     // - Support for ConstructorProperties
diff --git a/jOOQ/src/main/java/org/jooq/conf/BackslashEscaping.java b/jOOQ/src/main/java/org/jooq/conf/BackslashEscaping.java
index 8736f1f9ec..bfb0d10c73 100644
--- a/jOOQ/src/main/java/org/jooq/conf/BackslashEscaping.java
+++ b/jOOQ/src/main/java/org/jooq/conf/BackslashEscaping.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ExecuteWithoutWhere.java b/jOOQ/src/main/java/org/jooq/conf/ExecuteWithoutWhere.java
index 0e34f6a77f..a3327b1311 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ExecuteWithoutWhere.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ExecuteWithoutWhere.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/FetchIntermediateResult.java b/jOOQ/src/main/java/org/jooq/conf/FetchIntermediateResult.java
index 9aafb4d924..a1a9ac0bf6 100644
--- a/jOOQ/src/main/java/org/jooq/conf/FetchIntermediateResult.java
+++ b/jOOQ/src/main/java/org/jooq/conf/FetchIntermediateResult.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/InterpreterNameLookupCaseSensitivity.java b/jOOQ/src/main/java/org/jooq/conf/InterpreterNameLookupCaseSensitivity.java
index 37a816cff4..0ccb56e997 100644
--- a/jOOQ/src/main/java/org/jooq/conf/InterpreterNameLookupCaseSensitivity.java
+++ b/jOOQ/src/main/java/org/jooq/conf/InterpreterNameLookupCaseSensitivity.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/InterpreterSearchSchema.java b/jOOQ/src/main/java/org/jooq/conf/InterpreterSearchSchema.java
index e0897923b5..94de7c1172 100644
--- a/jOOQ/src/main/java/org/jooq/conf/InterpreterSearchSchema.java
+++ b/jOOQ/src/main/java/org/jooq/conf/InterpreterSearchSchema.java
@@ -2,10 +2,10 @@
 package org.jooq.conf;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/InvocationOrder.java b/jOOQ/src/main/java/org/jooq/conf/InvocationOrder.java
index 1453bfd03b..f37c2fc914 100644
--- a/jOOQ/src/main/java/org/jooq/conf/InvocationOrder.java
+++ b/jOOQ/src/main/java/org/jooq/conf/InvocationOrder.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/LocaleAdapter.java b/jOOQ/src/main/java/org/jooq/conf/LocaleAdapter.java
index 8a166a8db6..6405888d95 100644
--- a/jOOQ/src/main/java/org/jooq/conf/LocaleAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/conf/LocaleAdapter.java
@@ -39,7 +39,7 @@ package org.jooq.conf;
 
 import java.util.Locale;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * @author Lukas Eder
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedCatalog.java b/jOOQ/src/main/java/org/jooq/conf/MappedCatalog.java
index 1e811eb977..f45d88e100 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MappedCatalog.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedCatalog.java
@@ -6,12 +6,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
index 476269eb75..3d7d01f6a7 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedSchema.java
@@ -6,12 +6,12 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
index 5526165f1e..3c3802d5a4 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MappedTable.java
@@ -3,11 +3,11 @@ package org.jooq.conf;
 
 import java.io.Serializable;
 import java.util.regex.Pattern;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/MigrationSchema.java b/jOOQ/src/main/java/org/jooq/conf/MigrationSchema.java
index 5287698561..f459199c3a 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MigrationSchema.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MigrationSchema.java
@@ -2,10 +2,10 @@
 package org.jooq.conf;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/MigrationType.java b/jOOQ/src/main/java/org/jooq/conf/MigrationType.java
index 5a76578ac8..f6232466d7 100644
--- a/jOOQ/src/main/java/org/jooq/conf/MigrationType.java
+++ b/jOOQ/src/main/java/org/jooq/conf/MigrationType.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/NestedCollectionEmulation.java b/jOOQ/src/main/java/org/jooq/conf/NestedCollectionEmulation.java
index b1c32736ba..420983eead 100644
--- a/jOOQ/src/main/java/org/jooq/conf/NestedCollectionEmulation.java
+++ b/jOOQ/src/main/java/org/jooq/conf/NestedCollectionEmulation.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ObjectFactory.java b/jOOQ/src/main/java/org/jooq/conf/ObjectFactory.java
index d15db43177..2dc530f92e 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ObjectFactory.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ObjectFactory.java
@@ -1,9 +1,9 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParamCastMode.java b/jOOQ/src/main/java/org/jooq/conf/ParamCastMode.java
index 2ba34e81a0..77181c0a85 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParamCastMode.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParamCastMode.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParamType.java b/jOOQ/src/main/java/org/jooq/conf/ParamType.java
index 74ebc1522b..14118bbcb5 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParamType.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParamType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParseNameCase.java b/jOOQ/src/main/java/org/jooq/conf/ParseNameCase.java
index bffba8ba88..9799fbe26c 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParseNameCase.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParseNameCase.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParseSearchSchema.java b/jOOQ/src/main/java/org/jooq/conf/ParseSearchSchema.java
index 584a9a1a05..df8bf73194 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParseSearchSchema.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParseSearchSchema.java
@@ -2,10 +2,10 @@
 package org.jooq.conf;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParseUnknownFunctions.java b/jOOQ/src/main/java/org/jooq/conf/ParseUnknownFunctions.java
index 62fce49d66..f8ceb3e43c 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParseUnknownFunctions.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParseUnknownFunctions.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParseUnsupportedSyntax.java b/jOOQ/src/main/java/org/jooq/conf/ParseUnsupportedSyntax.java
index 48f602308f..1ad1741999 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParseUnsupportedSyntax.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParseUnsupportedSyntax.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ParseWithMetaLookups.java b/jOOQ/src/main/java/org/jooq/conf/ParseWithMetaLookups.java
index aa0b7ae0c9..d257466a38 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ParseWithMetaLookups.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ParseWithMetaLookups.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/QueryPoolable.java b/jOOQ/src/main/java/org/jooq/conf/QueryPoolable.java
index 54fed7ca67..fc35e75def 100644
--- a/jOOQ/src/main/java/org/jooq/conf/QueryPoolable.java
+++ b/jOOQ/src/main/java/org/jooq/conf/QueryPoolable.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RegexAdapter.java b/jOOQ/src/main/java/org/jooq/conf/RegexAdapter.java
index 61e8834609..2403a280c8 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RegexAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RegexAdapter.java
@@ -39,7 +39,7 @@ package org.jooq.conf;
 
 import java.util.regex.Pattern;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * @author Lukas Eder
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderDefaultNullability.java b/jOOQ/src/main/java/org/jooq/conf/RenderDefaultNullability.java
index 9fd90eb990..0b6204f222 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderDefaultNullability.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderDefaultNullability.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java b/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java
index c13526a48d..fdc0b75dbb 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderFormatting.java
@@ -2,10 +2,10 @@
 package org.jooq.conf;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderImplicitJoinType.java b/jOOQ/src/main/java/org/jooq/conf/RenderImplicitJoinType.java
index 09f6ab3f86..af80d7992f 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderImplicitJoinType.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderImplicitJoinType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderImplicitWindowRange.java b/jOOQ/src/main/java/org/jooq/conf/RenderImplicitWindowRange.java
index 350b94d14d..afad5b2845 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderImplicitWindowRange.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderImplicitWindowRange.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderKeywordCase.java b/jOOQ/src/main/java/org/jooq/conf/RenderKeywordCase.java
index fe8a710eb4..d140bfaf6b 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderKeywordCase.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderKeywordCase.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderKeywordStyle.java b/jOOQ/src/main/java/org/jooq/conf/RenderKeywordStyle.java
index c286aed48a..84dc7c817c 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderKeywordStyle.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderKeywordStyle.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
index 9031deb777..ae3f493904 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderMapping.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderNameCase.java b/jOOQ/src/main/java/org/jooq/conf/RenderNameCase.java
index 3011160efd..cb3daec6c9 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderNameCase.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderNameCase.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderNameStyle.java b/jOOQ/src/main/java/org/jooq/conf/RenderNameStyle.java
index 1f6aa58a3f..8700d1e58e 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderNameStyle.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderNameStyle.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderOptionalKeyword.java b/jOOQ/src/main/java/org/jooq/conf/RenderOptionalKeyword.java
index c265937420..7d0606172a 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderOptionalKeyword.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderOptionalKeyword.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/RenderQuotedNames.java b/jOOQ/src/main/java/org/jooq/conf/RenderQuotedNames.java
index fa04717b9f..becd4cdf9b 100644
--- a/jOOQ/src/main/java/org/jooq/conf/RenderQuotedNames.java
+++ b/jOOQ/src/main/java/org/jooq/conf/RenderQuotedNames.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/SQLDialectAdapter.java b/jOOQ/src/main/java/org/jooq/conf/SQLDialectAdapter.java
index 39219ce261..37f5022708 100644
--- a/jOOQ/src/main/java/org/jooq/conf/SQLDialectAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/conf/SQLDialectAdapter.java
@@ -37,7 +37,7 @@
  */
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.jooq.SQLDialect;
 
diff --git a/jOOQ/src/main/java/org/jooq/conf/Settings.java b/jOOQ/src/main/java/org/jooq/conf/Settings.java
index 420f55e74e..f9641d834f 100644
--- a/jOOQ/src/main/java/org/jooq/conf/Settings.java
+++ b/jOOQ/src/main/java/org/jooq/conf/Settings.java
@@ -6,13 +6,13 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.SQLDialect;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/conf/SettingsBase.java b/jOOQ/src/main/java/org/jooq/conf/SettingsBase.java
index 5fc3ff9f1e..7c8cd337d6 100644
--- a/jOOQ/src/main/java/org/jooq/conf/SettingsBase.java
+++ b/jOOQ/src/main/java/org/jooq/conf/SettingsBase.java
@@ -47,7 +47,7 @@ import java.io.Serializable;
  * of those many JAXB / XJC plugins. Besides, cloning objects through the
  * standard Java {@link Cloneable} mechanism is around factor 1000x faster than
  * using {@link Serializable}, and even 10000x faster than using
- * {@link javax.xml.bind.JAXB#marshal(Object, java.io.OutputStream)},
+ * {@link jakarta.xml.bind.JAXB#marshal(Object, java.io.OutputStream)},
  * marshalling a JAXB object into a {@link ByteArrayOutputStream}.
  *
  * @author Lukas Eder
diff --git a/jOOQ/src/main/java/org/jooq/conf/StatementType.java b/jOOQ/src/main/java/org/jooq/conf/StatementType.java
index 904fcba42c..7ec240ce85 100644
--- a/jOOQ/src/main/java/org/jooq/conf/StatementType.java
+++ b/jOOQ/src/main/java/org/jooq/conf/StatementType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/ThrowExceptions.java b/jOOQ/src/main/java/org/jooq/conf/ThrowExceptions.java
index 929e620cbf..4c064ac51f 100644
--- a/jOOQ/src/main/java/org/jooq/conf/ThrowExceptions.java
+++ b/jOOQ/src/main/java/org/jooq/conf/ThrowExceptions.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/TransformUnneededArithmeticExpressions.java b/jOOQ/src/main/java/org/jooq/conf/TransformUnneededArithmeticExpressions.java
index 0ec5ee3888..9ef31f798e 100644
--- a/jOOQ/src/main/java/org/jooq/conf/TransformUnneededArithmeticExpressions.java
+++ b/jOOQ/src/main/java/org/jooq/conf/TransformUnneededArithmeticExpressions.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/Transformation.java b/jOOQ/src/main/java/org/jooq/conf/Transformation.java
index 9e21c41902..b483b2c559 100644
--- a/jOOQ/src/main/java/org/jooq/conf/Transformation.java
+++ b/jOOQ/src/main/java/org/jooq/conf/Transformation.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/UpdateUnchangedRecords.java b/jOOQ/src/main/java/org/jooq/conf/UpdateUnchangedRecords.java
index 3536b4f2ed..a09f4256fd 100644
--- a/jOOQ/src/main/java/org/jooq/conf/UpdateUnchangedRecords.java
+++ b/jOOQ/src/main/java/org/jooq/conf/UpdateUnchangedRecords.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/WriteIfReadonly.java b/jOOQ/src/main/java/org/jooq/conf/WriteIfReadonly.java
index 529c2b4cea..a81f7b5c82 100644
--- a/jOOQ/src/main/java/org/jooq/conf/WriteIfReadonly.java
+++ b/jOOQ/src/main/java/org/jooq/conf/WriteIfReadonly.java
@@ -1,8 +1,8 @@
 
 package org.jooq.conf;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/conf/package-info.java b/jOOQ/src/main/java/org/jooq/conf/package-info.java
index 644c4d97a6..bb423cb465 100644
--- a/jOOQ/src/main/java/org/jooq/conf/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/conf/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.16.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-runtime-3.16.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jooq.conf;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResult.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResult.java
index 79eeb57008..6ee909d9d6 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResult.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResult.java
@@ -63,7 +63,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.TreeMap;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractXMLasObjectBinding.java b/jOOQ/src/main/java/org/jooq/impl/AbstractXMLasObjectBinding.java
index d191bd1394..fcd3972709 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractXMLasObjectBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractXMLasObjectBinding.java
@@ -46,13 +46,13 @@ import java.io.StringReader;
 import java.io.StringWriter;
 import java.sql.SQLXML;
 
-import javax.xml.bind.DataBindingException;
-import javax.xml.bind.JAXB;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.DataBindingException;
+import jakarta.xml.bind.JAXB;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
 import javax.xml.namespace.QName;
 
 import org.jooq.Converter;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Convert.java b/jOOQ/src/main/java/org/jooq/impl/Convert.java
index c17593f7a2..3de6056292 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Convert.java
@@ -89,7 +89,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 
 // ...
 import org.jooq.Converter;
diff --git a/jOOQ/src/main/java/org/jooq/impl/JSONReader.java b/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
index 566819f02b..923e493db1 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JSONReader.java
@@ -56,7 +56,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.jooq.DSLContext;
 import org.jooq.Field;
diff --git a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
index 875aa469b8..e947c0fd27 100644
--- a/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/LoaderImpl.java
@@ -66,7 +66,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
-import javax.xml.bind.DatatypeConverter;
+import jakarta.xml.bind.DatatypeConverter;
 
 import org.jooq.BatchBindStep;
 import org.jooq.Configuration;
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/ContentTypeAdapter.java b/jOOQ/src/main/java/org/jooq/migrations/xml/ContentTypeAdapter.java
index dd354af02a..a22a77c0d3 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/ContentTypeAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/ContentTypeAdapter.java
@@ -37,7 +37,7 @@
  */
 package org.jooq.migrations.xml;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.jooq.ContentType;
 
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ChangeType.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ChangeType.java
index 10fd49e48c..790985e6e3 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ChangeType.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ChangeType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.migrations.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/CommitType.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/CommitType.java
index 24db56c1bc..60be48194c 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/CommitType.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/CommitType.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/FileType.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/FileType.java
index fd7f7cf615..d24c436272 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/FileType.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/FileType.java
@@ -2,12 +2,12 @@
 package org.jooq.migrations.xml.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.ContentType;
 import org.jooq.migrations.xml.ContentTypeAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/MigrationsType.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/MigrationsType.java
index c62ab499ba..0b7f0e3357 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/MigrationsType.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/MigrationsType.java
@@ -5,11 +5,11 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ObjectFactory.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ObjectFactory.java
index 0de67739ed..769b2981ee 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ObjectFactory.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ObjectFactory.java
@@ -1,9 +1,9 @@
 
 package org.jooq.migrations.xml.jaxb;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.annotation.XmlElementDecl;
+import jakarta.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
 
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ParentType.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ParentType.java
index ec7743fa06..4bddf51622 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ParentType.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/ParentType.java
@@ -2,10 +2,10 @@
 package org.jooq.migrations.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/package-info.java b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/package-info.java
index 4d662ff4ad..d56f8bb964 100644
--- a/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/migrations/xml/jaxb/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-migrations-3.15.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-migrations-3.15.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jooq.migrations.xml.jaxb;
diff --git a/jOOQ/src/main/java/org/jooq/tools/Convert.java b/jOOQ/src/main/java/org/jooq/tools/Convert.java
index b406ca82d3..9649b9df3b 100644
--- a/jOOQ/src/main/java/org/jooq/tools/Convert.java
+++ b/jOOQ/src/main/java/org/jooq/tools/Convert.java
@@ -86,7 +86,7 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.JAXB;
+import jakarta.xml.bind.JAXB;
 
 // ...
 import org.jooq.Converter;
diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java
index 44a1d6d977..b6be1d5df4 100644
--- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java
+++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/MiniJAXB.java
@@ -64,15 +64,15 @@ import java.util.List;
 import java.util.Map;
 
 import javax.xml.XMLConstants;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlList;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlSchema;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlList;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlSchema;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/StringAdapter.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/StringAdapter.java
index 4986bc774c..f45a0ac505 100644
--- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/StringAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/StringAdapter.java
@@ -40,7 +40,7 @@ package org.jooq.util.jaxb.tools;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 import org.jooq.tools.StringUtils;
 
diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/TrimAdapter.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/TrimAdapter.java
index 8e19991602..36f621bd35 100644
--- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/TrimAdapter.java
+++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/TrimAdapter.java
@@ -37,7 +37,7 @@
  */
 package org.jooq.util.jaxb.tools;
 
-import javax.xml.bind.annotation.adapters.XmlAdapter;
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
 
 /**
  * [#2401] A string-trimming {@link XmlAdapter} that takes out whitespace from
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
index b47c6fbe6c..63d223f4d1 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Catalog.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java
index 55ac178ea7..b3b4c99dd2 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/CheckConstraint.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
index b2f07c3cf8..41b0a86d5f 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Column.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java
index 02aec19cab..278534eda2 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Domain.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java
index de731f1969..cd24d9073a 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/DomainConstraint.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java
index a782cc064d..382848f22c 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ElementType.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
index 3fb410e974..0144839c06 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Index.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
index 53c4bb1a81..d40d18ede9 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/IndexColumnUsage.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
index b2c4aac214..535e04c35f 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/InformationSchema.java
@@ -5,12 +5,12 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.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.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlType;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
 
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
index a162002f47..dbd457cda1 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/KeyColumnUsage.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectFactory.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectFactory.java
index 1838ad2a84..d246eee714 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectFactory.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectFactory.java
@@ -1,7 +1,7 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlRegistry;
+import jakarta.xml.bind.annotation.XmlRegistry;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectType.java
index 3fbeb7ed78..ce02ad97ba 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectType.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ObjectType.java
@@ -1,9 +1,9 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
index e25965abc7..03508c764e 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Parameter.java
@@ -2,12 +2,12 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ParameterMode.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ParameterMode.java
index 4e80563040..51c6a03622 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ParameterMode.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ParameterMode.java
@@ -1,8 +1,8 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
index 364cc6f170..a99c5f1649 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/ReferentialConstraint.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
index d5656d1a14..49be839dfe 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Routine.java
@@ -2,12 +2,12 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/RoutineType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/RoutineType.java
index 120ed5a702..599152f3a4 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/RoutineType.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/RoutineType.java
@@ -1,8 +1,8 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
index 8c37ec0f99..b8644a9aae 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Schema.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
index 16957cffb8..16d574325f 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Sequence.java
@@ -3,11 +3,11 @@ package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
 import java.math.BigInteger;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
index e50d25bdf5..c3e3671b68 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/Table.java
@@ -2,12 +2,12 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
index 20224f7329..b5e2157d6e 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraint.java
@@ -2,12 +2,12 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlSchemaType;
+import jakarta.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraintType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraintType.java
index 2b9a60f172..6cd558b3e7 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraintType.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableConstraintType.java
@@ -1,9 +1,9 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableType.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableType.java
index 48d4662afe..7a9ba220c2 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableType.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/TableType.java
@@ -1,9 +1,9 @@
 
 package org.jooq.util.xml.jaxb;
 
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
+import jakarta.xml.bind.annotation.XmlEnum;
+import jakarta.xml.bind.annotation.XmlEnumValue;
+import jakarta.xml.bind.annotation.XmlType;
 
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java
index 1324d81df1..1d16949927 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/View.java
@@ -2,11 +2,11 @@
 package org.jooq.util.xml.jaxb;
 
 import java.io.Serializable;
-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 org.jooq.util.jaxb.tools.StringAdapter;
 import org.jooq.util.jaxb.tools.XMLAppendable;
 import org.jooq.util.jaxb.tools.XMLBuilder;
diff --git a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java
index dc2bc463be..ec18f3e5ea 100644
--- a/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java
+++ b/jOOQ/src/main/java/org/jooq/util/xml/jaxb/package-info.java
@@ -1,2 +1,2 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@jakarta.xml.bind.annotation.XmlSchema(namespace = "http://www.jooq.org/xsd/jooq-meta-3.16.0.xsd", elementFormDefault = jakarta.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.jooq.util.xml.jaxb;
diff --git a/pom.xml b/pom.xml
index c3184158f3..c0ac055c3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,7 +42,7 @@
         <io.r2dbc.version>0.9.0.M2</io.r2dbc.version>
 
         <!-- From JDK 11 onwards, we need to depend on the JAXB API explicitly -->
-        <jaxb.version>2.3.1</jaxb.version>
+        <jaxb.version>3.0.0</jaxb.version>
         <javax.activation.version>1.2.0</javax.activation.version>
 
         <!-- Scala versions -->
@@ -240,8 +240,8 @@
             <!-- The dependency can cause trouble in older JDKs, so it needs to be
                  excluded from pre-java-9 builds: https://github.com/jOOQ/jOOQ/issues/7649 -->
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
 
@@ -263,16 +263,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-