diff --git a/ebean-api/pom.xml b/ebean-api/pom.xml
index 986e37569..72b6805ca 100644
--- a/ebean-api/pom.xml
+++ b/ebean-api/pom.xml
@@ -90,12 +90,22 @@
       <optional>true</optional>
     </dependency>
 
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <version>3.1.0</version>
       <optional>true</optional>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
+      <version>6.0.0</version>
+      <optional>true</optional>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <dependency>
       <groupId>io.avaje</groupId>
diff --git a/ebean-autotune/pom.xml b/ebean-autotune/pom.xml
index 620b7227b..45a07f58b 100644
--- a/ebean-autotune/pom.xml
+++ b/ebean-autotune/pom.xml
@@ -30,13 +30,27 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- needed for java 11+ -->
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.3.6</version>
       <scope>provided</scope>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <dependency>
       <groupId>io.ebean</groupId>
diff --git a/ebean-ddl-generator/pom.xml b/ebean-ddl-generator/pom.xml
index ce355ee74..a2515983f 100644
--- a/ebean-ddl-generator/pom.xml
+++ b/ebean-ddl-generator/pom.xml
@@ -39,13 +39,27 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- needed for java 11+ -->
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.3.6</version>
       <scope>provided</scope>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <!-- test dependencies -->
     <dependency>
diff --git a/ebean-externalmapping-xml/pom.xml b/ebean-externalmapping-xml/pom.xml
index f92f04783..5add9f48b 100644
--- a/ebean-externalmapping-xml/pom.xml
+++ b/ebean-externalmapping-xml/pom.xml
@@ -24,18 +24,32 @@
       <version>13.13.1</version>
     </dependency>
 
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.3.6</version>
     </dependency>
-
     <dependency>
       <groupId>jakarta.activation</groupId>
       <artifactId>jakarta.activation-api</artifactId>
       <version>1.2.1</version>
       <scope>provided</scope>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <dependency>
       <groupId>io.avaje</groupId>
diff --git a/ebean-test/pom.xml b/ebean-test/pom.xml
index d9df3da79..605bdb026 100644
--- a/ebean-test/pom.xml
+++ b/ebean-test/pom.xml
@@ -71,19 +71,32 @@
     </dependency>
 
     <!-- Including JAXB for DB Migration generation with Java 11+ -->
+    <!-- JAVAX-DEPENDENCY-START -->
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.3.6</version>
     </dependency>
-
-    <!-- Needed for module path compile, jaxb foo bar needs review -->
     <dependency>
       <groupId>jakarta.activation</groupId>
       <artifactId>jakarta.activation-api</artifactId>
       <version>1.2.1</version>
       <scope>provided</scope>
     </dependency>
+    <!-- JAVAX-DEPENDENCY-END -->
+    <!-- JAKARTA-DEPENDENCY-START ___
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.sun.xml.bind</groupId>
+      <artifactId>jaxb-impl</artifactId>
+      <version>4.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    ____ JAKARTA-DEPENDENCY-END -->
 
     <!-- Not strictly required but bring in H2 Driver because we use it so much -->
     <dependency>
diff --git a/jakarta-to-javax.sh b/jakarta-to-javax.sh
new file mode 100644
index 000000000..df9921da6
--- /dev/null
+++ b/jakarta-to-javax.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+## adjust pom dependencies
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAKARTA-DEPENDENCY-START -->|<!-- JAKARTA-DEPENDENCY-START ___|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAKARTA-DEPENDENCY-END -->|____ JAKARTA-DEPENDENCY-END -->|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAVAX-DEPENDENCY-START ___|<!-- JAVAX-DEPENDENCY-START -->|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|____ JAVAX-DEPENDENCY-END -->|<!-- JAVAX-DEPENDENCY-END -->|g' {} +
+
+sed -i'' -e 's|artifactId>jakarta-persistence-api|artifactId>persistence-api|g' ebean-api/pom.xml ebean-bom/pom.xml
+
+## adjust module-info
+sed -i'' -e 's| jakarta.persistence.api| persistence.api|g' ebean-api/src/main/java/module-info.java
+sed -i'' -e 's| jakarta.servlet;| javax.servlet.api;|g' ebean-api/src/main/java/module-info.java
+
+find . -type f -name 'module-info.java' -exec sed -i'' -e 's|jakarta.xml.bind|java.xml.bind|g' {} +
+
+## adjust code
+find ebean-api/src/main/java/io/ebean/event -type f -name '*.java' -exec sed -i'' -e 's|jakarta.servlet|javax.servlet|g' {} +
+
+find . -type f -name '*.java' -exec sed -i'' -e 's|jakarta.persistence.|javax.persistence.|g' {} +
+find . -type f -name '*.kt' -exec sed -i'' -e 's|jakarta.persistence.|javax.persistence.|g' {} +
+find . -type f -name '*.java' -exec sed -i'' -e 's|jakarta.xml.bind|javax.xml.bind|g' {} +
+find . -type f -name '*.kt' -exec sed -i'' -e 's|jakarta.xml.bind|javax.xml.bind|g' {} +
+
diff --git a/javax-to-jakarta.sh b/javax-to-jakarta.sh
new file mode 100644
index 000000000..f06d45be9
--- /dev/null
+++ b/javax-to-jakarta.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+## adjust pom dependencies
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAVAX-DEPENDENCY-START -->|<!-- JAVAX-DEPENDENCY-START ___|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAVAX-DEPENDENCY-END -->|____ JAVAX-DEPENDENCY-END -->|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|<!-- JAKARTA-DEPENDENCY-START ___|<!-- JAKARTA-DEPENDENCY-START -->|g' {} +
+find . -type f -name 'pom.xml' -exec sed -i'' -e 's|____ JAKARTA-DEPENDENCY-END -->|<!-- JAKARTA-DEPENDENCY-END -->|g' {} +
+
+sed -i'' -e 's|artifactId>persistence-api|artifactId>jakarta-persistence-api|g' ebean-api/pom.xml ebean-bom/pom.xml
+
+## adjust module-info
+sed -i'' -e 's| persistence.api| jakarta.persistence.api|g' ebean-api/src/main/java/module-info.java
+sed -i'' -e 's| javax.servlet.api| jakarta.servlet|g' ebean-api/src/main/java/module-info.java
+
+find . -type f -name 'module-info.java' -exec sed -i'' -e 's|java.xml.bind|jakarta.xml.bind|g' {} +
+
+## adjust code
+find ebean-api/src/main/java/io/ebean/event -type f -name '*.java' -exec sed -i'' -e 's|javax.servlet|jakarta.servlet|g' {} +
+
+find . -type f -name '*.java' -exec sed -i'' -e 's|javax.persistence.|jakarta.persistence.|g' {} +
+find . -type f -name '*.kt' -exec sed -i'' -e 's|javax.persistence.|jakarta.persistence.|g' {} +
+find . -type f -name '*.java' -exec sed -i'' -e 's|javax.xml.bind|jakarta.xml.bind|g' {} +
+find . -type f -name '*.kt' -exec sed -i'' -e 's|javax.xml.bind|jakarta.xml.bind|g' {} +
+