diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0d812cf0d..405dfe812 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: Maven Install
         run: mvn install -B -V -DskipTests -Dair.check.skip-all
       - name: Maven Tests
diff --git a/drift-api/pom.xml b/drift-api/pom.xml
index 287c4ba25..34b304a03 100644
--- a/drift-api/pom.xml
+++ b/drift-api/pom.xml
@@ -9,8 +9,8 @@
     </parent>
 
     <artifactId>drift-api</artifactId>
-    <description>Drift annotations and exceptions for use in Thrift interfaces and types</description>
     <packaging>jar</packaging>
+    <description>Drift annotations and exceptions for use in Thrift interfaces and types</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
diff --git a/drift-client/pom.xml b/drift-client/pom.xml
index 552de68e6..b9c3e48d7 100644
--- a/drift-client/pom.xml
+++ b/drift-client/pom.xml
@@ -19,25 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-protocol</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-spi</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.errorprone</groupId>
@@ -46,14 +27,14 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <optional>true</optional>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -75,10 +56,24 @@
             <groupId>io.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>org.weakref</groupId>
-            <artifactId>jmxutils</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-protocol</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
         </dependency>
 
         <dependency>
@@ -86,6 +81,11 @@
             <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.weakref</groupId>
+            <artifactId>jmxutils</artifactId>
+        </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>io.airlift</groupId>
diff --git a/drift-codec/pom.xml b/drift-codec/pom.xml
index a1fc9ae35..a12367bce 100644
--- a/drift-codec/pom.xml
+++ b/drift-codec/pom.xml
@@ -9,8 +9,8 @@
     </parent>
 
     <artifactId>drift-codec</artifactId>
-    <description>Annotation based encoder and decoder for Thrift</description>
     <packaging>jar</packaging>
+    <description>Annotation based encoder and decoder for Thrift</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -18,14 +18,17 @@
     </properties>
 
     <dependencies>
+
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-protocol</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -34,26 +37,23 @@
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bytecode</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift</groupId>
+            <artifactId>bytecode</artifactId>
         </dependency>
-
         <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-protocol</artifactId>
         </dependency>
 
         <dependency>
@@ -61,16 +61,16 @@
             <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
 
+        <!-- for testing -->
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -82,10 +82,10 @@
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>package</phase>
                         <goals>
                             <goal>shade</goal>
                         </goals>
+                        <phase>package</phase>
                         <configuration>
                             <createSourcesJar>true</createSourcesJar>
                             <shadeSourcesContent>true</shadeSourcesContent>
diff --git a/drift-idl-generator/pom.xml b/drift-idl-generator/pom.xml
index 1bd113875..d2a339a0d 100644
--- a/drift-idl-generator/pom.xml
+++ b/drift-idl-generator/pom.xml
@@ -9,33 +9,33 @@
     </parent>
 
     <artifactId>drift-idl-generator</artifactId>
-    <description>Generate Thrift IDL from Drift annotated classes</description>
     <packaging>jar</packaging>
+    <description>Generate Thrift IDL from Drift annotated classes</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
         </dependency>
 
         <!-- for testing -->
diff --git a/drift-integration-tests/pom.xml b/drift-integration-tests/pom.xml
index 7d5c36b8c..79cd2d016 100644
--- a/drift-integration-tests/pom.xml
+++ b/drift-integration-tests/pom.xml
@@ -19,99 +19,106 @@
     </properties>
 
     <dependencies>
+
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-client</artifactId>
+            <groupId>com.google.errorprone</groupId>
+            <artifactId>error_prone_annotations</artifactId>
             <scope>test</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-server</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-apache</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>bootstrap</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-netty</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>configuration</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-spi</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>jmx</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>security</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>stats</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
+            <groupId>io.airlift</groupId>
+            <artifactId>units</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>bootstrap</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-client</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>jmx</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-server</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>security</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-apache</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>stats</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-netty</artifactId>
             <scope>test</scope>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -128,9 +135,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.weakref</groupId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
             <scope>test</scope>
-            <artifactId>jmxutils</artifactId>
         </dependency>
 
         <dependency>
@@ -140,15 +147,8 @@
         </dependency>
 
         <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.errorprone</groupId>
-            <artifactId>error_prone_annotations</artifactId>
-            <optional>true</optional>
+            <groupId>org.weakref</groupId>
+            <artifactId>jmxutils</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/drift-javadoc/pom.xml b/drift-javadoc/pom.xml
index c115dd536..f77fe365e 100644
--- a/drift-javadoc/pom.xml
+++ b/drift-javadoc/pom.xml
@@ -9,35 +9,41 @@
     </parent>
 
     <artifactId>drift-javadoc</artifactId>
-    <description>Annotation processor to store the Javadoc of Drift classes</description>
     <packaging>jar</packaging>
+    <description>Annotation processor to store the Javadoc of Drift classes</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
     </properties>
 
     <dependencies>
+
+        <dependency>
+            <groupId>com.squareup</groupId>
+            <artifactId>javapoet</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.airlift.drift</groupId>
             <artifactId>drift-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.squareup</groupId>
-            <artifactId>javapoet</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <scope>test</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.takari.maven.plugins</groupId>
-            <artifactId>takari-plugin-testing</artifactId>
+            <artifactId>takari-plugin-integration-testing</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
 
+        <!-- for testing -->
         <dependency>
             <groupId>io.takari.maven.plugins</groupId>
-            <artifactId>takari-plugin-integration-testing</artifactId>
-            <type>pom</type>
+            <artifactId>takari-plugin-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -52,12 +58,6 @@
             <artifactId>assertj-core</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -78,10 +78,10 @@
                 <executions>
                     <execution>
                         <id>testProperties</id>
-                        <phase>process-test-resources</phase>
                         <goals>
                             <goal>testProperties</goal>
                         </goals>
+                        <phase>process-test-resources</phase>
                     </execution>
                 </executions>
             </plugin>
diff --git a/drift-maven-plugin/pom.xml b/drift-maven-plugin/pom.xml
index 13900b3c9..a4b7349ba 100644
--- a/drift-maven-plugin/pom.xml
+++ b/drift-maven-plugin/pom.xml
@@ -9,8 +9,8 @@
     </parent>
 
     <artifactId>drift-maven-plugin</artifactId>
-    <description>Maven plugin for Drift</description>
     <packaging>maven-plugin</packaging>
+    <description>Maven plugin for Drift</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
@@ -22,16 +22,16 @@
             <artifactId>drift-idl-generator</artifactId>
         </dependency>
 
-        <!-- Maven -->
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-core</artifactId>
+            <artifactId>maven-artifact</artifactId>
             <scope>provided</scope>
         </dependency>
 
+        <!-- Maven -->
         <dependency>
             <groupId>org.apache.maven</groupId>
-            <artifactId>maven-artifact</artifactId>
+            <artifactId>maven-core</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -54,17 +54,17 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- for testing -->
         <dependency>
             <groupId>io.takari.maven.plugins</groupId>
-            <artifactId>takari-plugin-testing</artifactId>
+            <artifactId>takari-plugin-integration-testing</artifactId>
+            <type>pom</type>
             <scope>test</scope>
         </dependency>
 
+        <!-- for testing -->
         <dependency>
             <groupId>io.takari.maven.plugins</groupId>
-            <artifactId>takari-plugin-integration-testing</artifactId>
-            <type>pom</type>
+            <artifactId>takari-plugin-testing</artifactId>
             <scope>test</scope>
         </dependency>
 
@@ -76,6 +76,16 @@
     </dependencies>
 
     <build>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <filtering>true</filtering>
+                <directory>src/main/resources-filtered</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>io.takari.maven.plugins</groupId>
@@ -84,10 +94,10 @@
                 <executions>
                     <execution>
                         <id>testProperties</id>
-                        <phase>process-test-resources</phase>
                         <goals>
                             <goal>testProperties</goal>
                         </goals>
+                        <phase>process-test-resources</phase>
                     </execution>
                 </executions>
             </plugin>
@@ -106,15 +116,5 @@
                 </configuration>
             </plugin>
         </plugins>
-
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-            <resource>
-                <directory>src/main/resources-filtered</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
     </build>
 </project>
diff --git a/drift-protocol/pom.xml b/drift-protocol/pom.xml
index d651cd58e..6f4929dc6 100644
--- a/drift-protocol/pom.xml
+++ b/drift-protocol/pom.xml
@@ -9,8 +9,8 @@
     </parent>
 
     <artifactId>drift-protocol</artifactId>
-    <description>Core classes for Drift</description>
     <packaging>jar</packaging>
+    <description>Core classes for Drift</description>
 
     <properties>
         <air.main.basedir>${project.parent.basedir}</air.main.basedir>
diff --git a/drift-server/pom.xml b/drift-server/pom.xml
index eda54698d..d15b9386c 100644
--- a/drift-server/pom.xml
+++ b/drift-server/pom.xml
@@ -19,19 +19,10 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
-        </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-spi</artifactId>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
@@ -40,11 +31,6 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>io.airlift</groupId>
             <artifactId>configuration</artifactId>
@@ -59,6 +45,20 @@
             <groupId>io.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>jakarta.annotation</groupId>
diff --git a/drift-transport-apache/pom.xml b/drift-transport-apache/pom.xml
index 9bc3dcb96..6d3fd6673 100644
--- a/drift-transport-apache/pom.xml
+++ b/drift-transport-apache/pom.xml
@@ -19,25 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-protocol</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-spi</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -52,12 +33,12 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>configuration</artifactId>
+            <artifactId>concurrent</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>concurrent</artifactId>
+            <artifactId>configuration</artifactId>
         </dependency>
 
         <dependency>
@@ -67,18 +48,26 @@
 
         <dependency>
             <groupId>io.airlift</groupId>
-            <artifactId>jmx</artifactId>
-            <scope>test</scope>
+            <artifactId>units</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>io.airlift</groupId>
-            <artifactId>units</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-protocol</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
         </dependency>
 
         <dependency>
@@ -92,6 +81,17 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>jmx</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>io.airlift</groupId>
diff --git a/drift-transport-netty/pom.xml b/drift-transport-netty/pom.xml
index 39ee20fbb..1d53e2650 100644
--- a/drift-transport-netty/pom.xml
+++ b/drift-transport-netty/pom.xml
@@ -19,24 +19,11 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
-        </dependency>
 
         <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-protocol</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-transport-spi</artifactId>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -46,14 +33,14 @@
         </dependency>
 
         <dependency>
-            <groupId>com.google.inject</groupId>
-            <artifactId>guice</artifactId>
-            <optional>true</optional>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
+            <groupId>com.google.inject</groupId>
+            <artifactId>guice</artifactId>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -80,16 +67,29 @@
             <groupId>io.airlift</groupId>
             <artifactId>units</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
+        </dependency>
 
         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>jakarta.validation</groupId>
-            <artifactId>jakarta.validation-api</artifactId>
-            <optional>true</optional>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-protocol</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-transport-spi</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
         </dependency>
 
         <dependency>
@@ -98,8 +98,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.spotbugs</groupId>
-            <artifactId>spotbugs-annotations</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -117,9 +117,15 @@
         </dependency>
 
         <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
+            <groupId>org.apache.thrift</groupId>
+            <artifactId>libthrift</artifactId>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.httpcomponents</groupId>
+                    <artifactId>httpclient</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -129,15 +135,9 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.thrift</groupId>
-            <artifactId>libthrift</artifactId>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.httpcomponents</groupId>
-                    <artifactId>httpclient</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>
diff --git a/drift-transport-spi/pom.xml b/drift-transport-spi/pom.xml
index c23508128..a7edb25f8 100644
--- a/drift-transport-spi/pom.xml
+++ b/drift-transport-spi/pom.xml
@@ -19,20 +19,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-codec</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.airlift.drift</groupId>
-            <artifactId>drift-protocol</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -50,6 +36,20 @@
             <artifactId>units</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-codec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift.drift</groupId>
+            <artifactId>drift-protocol</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>jakarta.validation</groupId>
diff --git a/pom.xml b/pom.xml
index 26320ddca..dd87a9bec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>143</version>
+        <version>156</version>
     </parent>
 
     <groupId>io.airlift.drift</groupId>
@@ -17,32 +17,32 @@
     <description>Annotation based Thrift implementation</description>
     <url>https://github.com/airlift/drift</url>
 
-    <scm>
-        <connection>scm:git:git://github.com/airlift/drift.git</connection>
-        <url>https://github.com/airlift/drift</url>
-        <tag>HEAD</tag>
-    </scm>
+    <inceptionYear>2012</inceptionYear>
+
+    <developers>
+        <!-- see git log -->
+    </developers>
 
     <modules>
         <module>drift-api</module>
-        <module>drift-protocol</module>
-        <module>drift-codec</module>
         <module>drift-client</module>
+        <module>drift-codec</module>
         <module>drift-idl-generator</module>
         <module>drift-integration-tests</module>
         <module>drift-javadoc</module>
         <module>drift-maven-plugin</module>
+        <module>drift-protocol</module>
         <module>drift-server</module>
         <module>drift-transport-apache</module>
         <module>drift-transport-netty</module>
         <module>drift-transport-spi</module>
     </modules>
 
-    <inceptionYear>2012</inceptionYear>
-
-    <developers>
-        <!-- see git log -->
-    </developers>
+    <scm>
+        <connection>scm:git:git://github.com/airlift/drift.git</connection>
+        <tag>HEAD</tag>
+        <url>https://github.com/airlift/drift</url>
+    </scm>
 
     <properties>
         <air.license.header-file>license/apache-copyright-header.txt</air.license.header-file>
@@ -50,180 +50,173 @@
         <air.check.skip-jacoco>true</air.check.skip-jacoco>
         <air.check.skip-spotbugs>true</air.check.skip-spotbugs>
 
-        <project.build.targetJdk>17</project.build.targetJdk>
+        <project.build.targetJdk>21</project.build.targetJdk>
         <air.modernizer.java-version>8</air.modernizer.java-version>
 
-        <dep.airlift.version>234</dep.airlift.version>
+        <dep.airlift.version>246</dep.airlift.version>
         <dep.takari-plugin.version>3.0.2</dep.takari-plugin.version>
         <dep.maven.version>3.9.6</dep.maven.version>
+
+        <air.check.skip-pmd>true</air.check.skip-pmd>
     </properties>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-codec</artifactId>
-                <version>${project.version}</version>
+                <groupId>com.squareup</groupId>
+                <artifactId>javapoet</artifactId>
+                <version>1.9.0</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-client</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>bootstrap</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-idl-generator</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>bytecode</artifactId>
+                <version>1.1</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-protocol</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>concurrent</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-server</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>configuration</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-transport-apache</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>jmx</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-transport-netty</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>log</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift.drift</groupId>
-                <artifactId>drift-transport-spi</artifactId>
-                <version>${project.version}</version>
+                <groupId>io.airlift</groupId>
+                <artifactId>security</artifactId>
+                <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.airlift</groupId>
-                <artifactId>bootstrap</artifactId>
+                <artifactId>stats</artifactId>
                 <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.airlift</groupId>
-                <artifactId>configuration</artifactId>
+                <artifactId>testing</artifactId>
                 <version>${dep.airlift.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>io.airlift</groupId>
-                <artifactId>concurrent</artifactId>
-                <version>${dep.airlift.version}</version>
+                <artifactId>units</artifactId>
+                <version>1.10</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>jmx</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-api</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>log</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-client</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>bytecode</artifactId>
-                <version>1.1</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-codec</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>security</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-idl-generator</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>stats</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-protocol</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>testing</artifactId>
-                <version>${dep.airlift.version}</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-server</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>units</artifactId>
-                <version>1.3</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-transport-apache</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>io.netty</groupId>
-                <artifactId>netty-all</artifactId>
-                <version>4.1.29.Final</version>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-transport-netty</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.thrift</groupId>
-                <artifactId>libthrift</artifactId>
-                <version>0.12.0</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpcore</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache.httpcomponents</groupId>
-                        <artifactId>httpclient</artifactId>
-                    </exclusion>
-                </exclusions>
+                <groupId>io.airlift.drift</groupId>
+                <artifactId>drift-transport-spi</artifactId>
+                <version>${project.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>com.squareup</groupId>
-                <artifactId>javapoet</artifactId>
-                <version>1.9.0</version>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-all</artifactId>
+                <version>4.1.29.Final</version>
             </dependency>
 
             <dependency>
                 <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-plugin-testing</artifactId>
+                <artifactId>takari-plugin-integration-testing</artifactId>
                 <version>${dep.takari-plugin.version}</version>
+                <type>pom</type>
             </dependency>
 
             <dependency>
                 <groupId>io.takari.maven.plugins</groupId>
-                <artifactId>takari-plugin-integration-testing</artifactId>
+                <artifactId>takari-plugin-testing</artifactId>
                 <version>${dep.takari-plugin.version}</version>
-                <type>pom</type>
+            </dependency>
+
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.maven</groupId>
-                <artifactId>maven-core</artifactId>
+                <artifactId>maven-artifact</artifactId>
                 <version>${dep.maven.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.maven</groupId>
-                <artifactId>maven-artifact</artifactId>
+                <artifactId>maven-core</artifactId>
                 <version>${dep.maven.version}</version>
             </dependency>
 
@@ -240,9 +233,19 @@
             </dependency>
 
             <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.13.2</version>
+                <groupId>org.apache.thrift</groupId>
+                <artifactId>libthrift</artifactId>
+                <version>0.12.0</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpclient</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.httpcomponents</groupId>
+                        <artifactId>httpcore</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
         </dependencies>
     </dependencyManagement>