diff --git a/drift-codec-utils/pom.xml b/drift-codec-utils/pom.xml
index bd76882d..50766922 100644
--- a/drift-codec-utils/pom.xml
+++ b/drift-codec-utils/pom.xml
@@ -84,6 +84,16 @@
                     </exclusionPatterns>
                 </configuration>
             </plugin>
+            <!-- Pull in from new repo https://github.com/prestodb/airlift/blob/master/drift/drift-codec-utils/pom.xml -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <ignoredNonTestScopedDependencies>
+                        <ignoredNonTestScopedDependency>com.facebook.drift:drift-api</ignoredNonTestScopedDependency>
+                    </ignoredNonTestScopedDependencies>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/drift-idl-generator/pom.xml b/drift-idl-generator/pom.xml
index 750e126a..ca303fc3 100644
--- a/drift-idl-generator/pom.xml
+++ b/drift-idl-generator/pom.xml
@@ -62,4 +62,18 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <configuration>
+                    <ignoredNonTestScopedDependencies>
+                        <dependency>io.airlift:units</dependency>
+                    </ignoredNonTestScopedDependencies>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/drift-integration-tests/pom.xml b/drift-integration-tests/pom.xml
index 0f21c518..00ddc32e 100644
--- a/drift-integration-tests/pom.xml
+++ b/drift-integration-tests/pom.xml
@@ -150,5 +150,11 @@
             <artifactId>jsr305</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-buffer</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 8e1ea0f2..52fdbceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.facebook.airlift</groupId>
         <artifactId>airbase</artifactId>
-        <version>95</version>
+        <version>107</version>
     </parent>
 
     <groupId>com.facebook.drift</groupId>
@@ -153,12 +153,6 @@
                 <version>${dep.airlift.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>units</artifactId>
-                <version>${dep.airlift.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>io.airlift</groupId>
                 <artifactId>parameternames</artifactId>
@@ -320,12 +314,32 @@
                 <artifactId>joda-time</artifactId>
                 <version>2.9.9</version>
             </dependency>
+
+            <dependency>
+                <groupId>javax.validation</groupId>
+                <artifactId>validation-api</artifactId>
+                <version>2.0.1.Final</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>4.2.2</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <build>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.gaul</groupId>
+                    <artifactId>modernizer-maven-plugin</artifactId>
+                    <version>3.1.0</version>
+                    <configuration>
+                        <skip>true</skip>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-plugin-plugin</artifactId>