diff --git a/artemis-jakarta-client/pom.xml b/artemis-jakarta-client/pom.xml
index 8e2381fd10..f8a4b71838 100644
--- a/artemis-jakarta-client/pom.xml
+++ b/artemis-jakarta-client/pom.xml
@@ -15,82 +15,100 @@
   limitations under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+   <modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>artemis-pom</artifactId>
-        <version>2.19.0-SNAPSHOT</version>
-    </parent>
+   <parent>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>artemis-pom</artifactId>
+      <version>2.19.0-SNAPSHOT</version>
+   </parent>
 
-    <artifactId>artemis-jakarta-client</artifactId>
-    <packaging>jar</packaging>
-    <name>ActiveMQ Artemis Jakarta Messaging Client</name>
+   <artifactId>artemis-jakarta-client</artifactId>
+   <packaging>jar</packaging>
+   <name>ActiveMQ Artemis Jakarta Messaging Client</name>
 
-    <properties>
-        <activemq.basedir>${project.basedir}/..</activemq.basedir>
-        <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
-    </properties>
+   <properties>
+      <activemq.basedir>${project.basedir}/..</activemq.basedir>
+      <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+   </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-jms-client</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-            <!-- needed for the maven reactor -->
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-core-client</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-commons</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-selector</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.jms</groupId>
-            <artifactId>jakarta.jms-api</artifactId>
-            <version>${jakarta.jms-api.version}</version>
-        </dependency>
-    </dependencies>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>com.google.errorprone</groupId>
+         <artifactId>error_prone_core</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+         <scope>test</scope>
+         <type>test-jar</type>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-selector</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.jms</groupId>
+         <artifactId>jakarta.jms-api</artifactId>
+         <version>${jakarta.jms-api.version}</version>
+      </dependency>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wildfly.extras.batavia</groupId>
-                <artifactId>transformer-tools-mvn</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>transform-classes</goal>
-                        </goals>
-                        <configuration>
-                            <inputFile>${project.basedir}/../artemis-jms-client/target/classes/</inputFile>
-                            <outputFolder>${project.build.outputDirectory}</outputFolder>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.wildfly.extras.batavia</groupId>
-                        <artifactId>transformer-impl-eclipse</artifactId>
-                        <version>${version.batavia}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+   </dependencies>
+
+    
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.wildfly.extras.batavia</groupId>
+            <artifactId>transformer-tools-mvn</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-sources</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>transform-sources</goal>
+                  </goals>
+                  <configuration>
+                     <source-project>${project.basedir}/../artemis-jms-client</source-project>
+                  </configuration>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>org.wildfly.extras.batavia</groupId>
+                  <artifactId>transformer-impl-eclipse</artifactId>
+                  <version>${version.batavia}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
 </project>
diff --git a/artemis-jakarta-ra/pom.xml b/artemis-jakarta-ra/pom.xml
index 16ab7e5717..67ff9c9e49 100644
--- a/artemis-jakarta-ra/pom.xml
+++ b/artemis-jakarta-ra/pom.xml
@@ -29,44 +29,104 @@
 
    <properties>
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
+      <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+      <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
+      <jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
    </properties>
 
 
-  <dependencies>
+   <dependencies>
       <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>artemis-ra</artifactId>
-          <version>${project.version}</version>
-          <scope>provided</scope>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
       </dependency>
-  </dependencies>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-annotations</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>com.google.errorprone</groupId>
+         <artifactId>error_prone_core</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-client</artifactId>
+         <version>${project.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.resource</groupId>
+         <artifactId>jakarta.resource-api</artifactId>
+         <version>${jakarta.resource-api.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.transaction</groupId>
+         <artifactId>jakarta.transaction-api</artifactId>
+         <version>${jakarta.transaction-api.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.jms</groupId>
+         <artifactId>jakarta.jms-api</artifactId>
+         <version>${jakarta.jms-api.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-service-extensions</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.jgroups</groupId>
+         <artifactId>jgroups</artifactId>
+      </dependency>
+   </dependencies>
 
-  <build>
+   <build>
       <plugins>
-          <plugin>
-              <groupId>org.wildfly.extras.batavia</groupId>
-              <artifactId>transformer-tools-mvn</artifactId>
-              <executions>
-                  <execution>
-                      <id>transform</id>
-                      <phase>process-classes</phase>
-                      <goals>
-                          <goal>transform-classes</goal>
-                      </goals>
-                      <configuration>
-                          <inputFile>${project.basedir}/../artemis-ra/target/classes/</inputFile>
-                          <outputFolder>${project.build.outputDirectory}</outputFolder>
-                      </configuration>
-                  </execution>
-              </executions>
-              <dependencies>
-                  <dependency>
-                      <groupId>org.wildfly.extras.batavia</groupId>
-                      <artifactId>transformer-impl-eclipse</artifactId>
-                      <version>${version.batavia}</version>
-                  </dependency>
-              </dependencies>
-          </plugin>
+         <plugin>
+            <groupId>org.wildfly.extras.batavia</groupId>
+            <artifactId>transformer-tools-mvn</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-sources</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>transform-sources</goal>
+                  </goals>
+                  <configuration>
+                     <source-project>${project.basedir}/../artemis-ra</source-project>
+                  </configuration>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>org.wildfly.extras.batavia</groupId>
+                  <artifactId>transformer-impl-eclipse</artifactId>
+                  <version>${version.batavia}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
       </plugins>
-  </build>
+   </build>
 </project>
diff --git a/artemis-jakarta-server/pom.xml b/artemis-jakarta-server/pom.xml
index 1a7276ed05..9c847abd81 100644
--- a/artemis-jakarta-server/pom.xml
+++ b/artemis-jakarta-server/pom.xml
@@ -29,43 +29,105 @@
 
     <properties>
         <activemq.basedir>${project.basedir}/..</activemq.basedir>
+        <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+        <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
+        <jakarta.resource-api.version>2.0.0</jakarta.resource-api.version>
+        <jakarta.json-api.version>2.0.1</jakarta.json-api.version>
     </properties>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>artemis-jms-server</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
+   <dependencies>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-annotations</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_core</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-server</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-journal</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-service-extensions</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.jms</groupId>
+         <artifactId>jakarta.jms-api</artifactId>
+         <version>${jakarta.jms-api.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.transaction</groupId>
+         <artifactId>jakarta.transaction-api</artifactId>
+         <version>${jakarta.transaction-api.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.json</groupId>
+         <artifactId>jakarta.json-api</artifactId>
+         <version>${jakarta.json-api.version}</version>
+      </dependency>
+   </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.wildfly.extras.batavia</groupId>
-                <artifactId>transformer-tools-mvn</artifactId>
-                <executions>
-                    <execution>
-                        <id>transform</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>transform-classes</goal>
-                        </goals>
-                        <configuration>
-                            <inputFile>${project.basedir}/../artemis-jms-server/target/classes/</inputFile>
-                            <outputFolder>${project.build.outputDirectory}</outputFolder>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.wildfly.extras.batavia</groupId>
-                        <artifactId>transformer-impl-eclipse</artifactId>
-                        <version>${version.batavia}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
+   <build>
+      <plugins>
+         <plugin>
+            <groupId>org.wildfly.extras.batavia</groupId>
+            <artifactId>transformer-tools-mvn</artifactId>
+            <executions>
+               <execution>
+                  <id>transform-sources</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>transform-sources</goal>
+                  </goals>
+                  <configuration>
+                     <source-project>${project.basedir}/../artemis-jms-server</source-project>
+                  </configuration>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>org.wildfly.extras.batavia</groupId>
+                  <artifactId>transformer-impl-eclipse</artifactId>
+                  <version>${version.batavia}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+      </plugins>
+   </build>
 </project>
diff --git a/artemis-jakarta-service-extensions/pom.xml b/artemis-jakarta-service-extensions/pom.xml
index 817d90a99a..e3e0d22e6e 100644
--- a/artemis-jakarta-service-extensions/pom.xml
+++ b/artemis-jakarta-service-extensions/pom.xml
@@ -29,17 +29,79 @@
 
    <properties>
       <activemq.basedir>${project.basedir}/..</activemq.basedir>
+      <jakarta.jms-api.version>3.0.0</jakarta.jms-api.version>
+      <jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
    </properties>
 
    <dependencies>
       <dependency>
-          <groupId>org.apache.activemq</groupId>
-          <artifactId>artemis-service-extensions</artifactId>
-          <version>${project.version}</version>
-          <scope>provided</scope>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-core-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-jakarta-client</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>artemis-commons</artifactId>
+         <version>${project.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-processor</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logging</groupId>
+         <artifactId>jboss-logging-annotations</artifactId>
+         <scope>provided</scope>
+         <optional>true</optional>
+      </dependency>
+      <dependency>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_core</artifactId>
+      </dependency>
+      <dependency>
+         <groupId>org.jboss.logmanager</groupId>
+         <artifactId>jboss-logmanager</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+          <groupId>org.wildfly.common</groupId>
+          <artifactId>wildfly-common</artifactId>
+          <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.transaction</groupId>
+         <artifactId>jakarta.transaction-api</artifactId>
+         <version>${jakarta.transaction-api.version}</version>
+      </dependency>
+      <dependency>
+         <groupId>jakarta.jms</groupId>
+         <artifactId>jakarta.jms-api</artifactId>
+         <version>${jakarta.jms-api.version}</version>
+         <scope>provided</scope>
+      </dependency>
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <scope>test</scope>
+      </dependency>
+      <dependency>
+         <groupId>org.jgroups</groupId>
+         <artifactId>jgroups</artifactId>
       </dependency>
    </dependencies>
 
+
    <build>
       <plugins>
          <plugin>
@@ -47,24 +109,23 @@
             <artifactId>transformer-tools-mvn</artifactId>
             <executions>
                <execution>
-                   <id>transform</id>
-                   <phase>process-classes</phase>
-                   <goals>
-                      <goal>transform-classes</goal>
-                   </goals>
-                   <configuration>
-                      <inputFile>${project.basedir}/../artemis-service-extensions/target/classes/</inputFile>
-                      <outputFolder>${project.build.outputDirectory}</outputFolder>
-                   </configuration>
-                </execution>
-             </executions>
-             <dependencies>
-                 <dependency>
-                     <groupId>org.wildfly.extras.batavia</groupId>
-                     <artifactId>transformer-impl-eclipse</artifactId>
-                     <version>${version.batavia}</version>
-                 </dependency>
-             </dependencies>
+                  <id>transform-sources</id>
+                  <phase>generate-sources</phase>
+                  <goals>
+                     <goal>transform-sources</goal>
+                  </goals>
+                  <configuration>
+                     <source-project>${project.basedir}/../artemis-service-extensions</source-project>
+                  </configuration>
+               </execution>
+            </executions>
+            <dependencies>
+               <dependency>
+                  <groupId>org.wildfly.extras.batavia</groupId>
+                  <artifactId>transformer-impl-eclipse</artifactId>
+                  <version>${version.batavia}</version>
+               </dependency>
+            </dependencies>
          </plugin>
       </plugins>
    </build>
diff --git a/pom.xml b/pom.xml
index 390b822a7a..0438ff07e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,7 @@
       <version.jaxb.runtime>2.3.3</version.jaxb.runtime>
       <paho.client.mqttv3.version>1.2.5</paho.client.mqttv3.version>
       <!-- for JakrtaEE -->
-      <version.batavia>1.0.5.Final</version.batavia>
+      <version.batavia>1.0.10.Final</version.batavia>
 
       <!-- used on tests -->
       <groovy.version>2.5.10</groovy.version>