diff --git a/README.md b/README.md
index 9ac25d16b..0d3f1db94 100644
--- a/README.md
+++ b/README.md
@@ -329,7 +329,7 @@ Airbase provides versions for the following well-known dependencies:
   <tr><th>Dependency name</th><th>Group/Artifact Ids</th></tr>
   <tr>
    <td>Google Guice</td>
-   <td><tt>com.google.inject:guice</tt><p/><tt>com.google.inject.extensions:guice-servlet</tt><p/><tt>com.google.inject.extensions:guice-assistedinject</tt><p/><tt>com.google.inject.extensions:guice-multibindings</tt><p/><tt>com.google.inject.extensions:guice-throwingproviders</tt></td>
+   <td><tt>com.google.inject:guice</tt><p/><tt>com.google.inject.extensions:guice-servlet</tt><p/><tt>com.google.inject.extensions:guice-assistedinject</tt><p/><tt>com.google.inject.extensions:guice-throwingproviders</tt></td>
   </tr>
   <tr>
    <td>Google Guava</td>
diff --git a/airbase-policy/pom.xml b/airbase-policy/pom.xml
index 379d7a1dd..b807e3732 100644
--- a/airbase-policy/pom.xml
+++ b/airbase-policy/pom.xml
@@ -11,4 +11,17 @@
     <artifactId>airbase-policy</artifactId>
 
     <description>Policy files for Airbase</description>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>${dep.maven-resources-plugin.version}</version>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/airbase/pom.xml b/airbase/pom.xml
index cf7b82d20..2aa2f0c62 100644
--- a/airbase/pom.xml
+++ b/airbase/pom.xml
@@ -79,10 +79,11 @@
     <properties>
         <!-- see http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.build.targetJdk>1.8</project.build.targetJdk>
+        <project.build.targetJdk>21</project.build.targetJdk>
         <project.report.outputEncoding>UTF-8</project.report.outputEncoding>
         <project.report.inputEncoding>UTF-8</project.report.inputEncoding>
 
+
         <!-- airlift build specific options are prefixed air.build. -->
 
         <!-- Default jvm size for compiler, tests etc. -->
@@ -176,19 +177,19 @@
         <dep.packaging.version>0.163</dep.packaging.version>
 
         <!-- Dependency versions that should be the same everywhere. -->
-        <dep.guice.version>4.2.2</dep.guice.version>
-        <dep.guava.version>26.0-jre</dep.guava.version>
-        <dep.slf4j.version>1.7.25</dep.slf4j.version>
+        <dep.guice.version>5.0.1</dep.guice.version>
+        <dep.guava.version>32.1.0-jre</dep.guava.version>
+        <dep.slf4j.version>2.0.16</dep.slf4j.version>
         <dep.logback.version>1.2.3</dep.logback.version>
         <dep.javax-inject.version>1</dep.javax-inject.version>
         <dep.javax-validation.version>2.0.1.Final</dep.javax-validation.version>
         <dep.javax-servlet.version>3.1.0</dep.javax-servlet.version>
         <dep.bval.version>2.0.0</dep.bval.version>
-        <dep.jackson.version>2.10.0</dep.jackson.version>
+        <dep.jackson.version>2.11.0</dep.jackson.version>
         <dep.jmxutils.version>1.19</dep.jmxutils.version>
-        <dep.cglib.version>3.2.5</dep.cglib.version>
+        <dep.cglib.version>3.3.0</dep.cglib.version>
         <dep.joda.version>2.9.9</dep.joda.version>
-        <dep.spotbugs-annotations.version>3.1.10</dep.spotbugs-annotations.version>
+        <dep.spotbugs-annotations.version>4.8.6</dep.spotbugs-annotations.version>
         <dep.testng.version>6.9.6</dep.testng.version>
         <dep.assertj-core.version>3.5.2</dep.assertj-core.version>
         <dep.assertj-guava.version>3.1.0</dep.assertj-guava.version>
@@ -197,7 +198,6 @@
         <dep.hamcrest.version>1.3</dep.hamcrest.version>
         <dep.mockito.version>1.9.5</dep.mockito.version>
         <dep.objenesis.version>1.3</dep.objenesis.version>
-        <dep.slice.version>0.34</dep.slice.version>
         <dep.jmh.version>1.20</dep.jmh.version>
 
         <!-- license headers -->
@@ -211,6 +211,8 @@
 
         <!-- nexus-staging-maven-plugin version -->
         <dep.nexus-staging-plugin.version>1.6.8</dep.nexus-staging-plugin.version>
+        <dep.maven-resources-plugin.version>3.3.1</dep.maven-resources-plugin.version>
+        <dep.plugin.pmd-runtime.version>7.7.0</dep.plugin.pmd-runtime.version>
     </properties>
 
     <build>
@@ -242,6 +244,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>3.1.1</version>
+                    <configuration>
+                        <allowIncompleteProjects>true</allowIncompleteProjects>
+                    </configuration>
                 </plugin>
 
                 <plugin>
@@ -254,6 +259,9 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-install-plugin</artifactId>
                     <version>3.1.1</version>
+                    <configuration>
+                        <allowIncompleteProjects>true</allowIncompleteProjects>
+                    </configuration>
                 </plugin>
 
                 <plugin>
@@ -265,12 +273,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
+                    <version>3.5.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>extra-enforcer-rules</artifactId>
-                            <version>1.1</version>
+                            <version>1.9.0</version>
                         </dependency>
                     </dependencies>
                     <executions>
@@ -345,16 +353,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.1</version>
-                    <dependencies>
-                        <!-- TODO: remove after updating to 3.1.2 -->
-                        <!-- see https://issues.apache.org/jira/browse/MDEP-613 -->
-                        <dependency>
-                            <groupId>org.apache.maven.shared</groupId>
-                            <artifactId>maven-dependency-analyzer</artifactId>
-                            <version>1.11.1</version>
-                        </dependency>
-                    </dependencies>
+                    <version>3.8.1</version>
                     <configuration>
                         <skip>${air.check.skip-dependency}</skip>
                         <failOnWarning>${air.check.fail-dependency}</failOnWarning>
@@ -387,7 +386,7 @@
                         <fork>true</fork>
                         <compilerArgs>
                             <!-- Revert to <parameters>true</parameters> once IntelliJ 183.888 is widespread -->
-                            <arg>-parameters</arg>
+                            <parameters>true</parameters>
                         </compilerArgs>
                     </configuration>
                 </plugin>
@@ -396,7 +395,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>2.6</version>
+                    <version>${dep.maven-resources-plugin.version}</version>
                     <configuration>
                         <encoding>${project.build.sourceEncoding}</encoding>
                     </configuration>
@@ -667,7 +666,7 @@
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>3.1.10</version>
+                    <version>4.8.6.5</version>
                     <configuration>
                         <skip>${air.check.skip-spotbugs}</skip>
                         <jvmArgs>-Xmx${air.build.jvmsize}</jvmArgs>
@@ -687,12 +686,11 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.26.0</version>
                     <configuration>
                         <skip>${air.check.skip-pmd}</skip>
                         <failOnViolation>${air.check.fail-pmd}</failOnViolation>
                         <targetJdk>${project.build.targetJdk}</targetJdk>
-                        <sourceEncoding>${project.build.sourceEncoding}</sourceEncoding>
                         <minimumTokens>100</minimumTokens>
                         <excludes>
                             <exclude>**/*Bean.java</exclude>
@@ -702,9 +700,10 @@
                             <excludeRoot>target/generated-sources/stubs</excludeRoot>
                         </excludeRoots>
                         <rulesets>
-                            <ruleset>/rulesets/java/basic.xml</ruleset>
-                            <ruleset>/rulesets/java/clone.xml</ruleset>
-                            <ruleset>/rulesets/java/finalizers.xml</ruleset>
+                            <ruleset>/category/java/performance.xml</ruleset>
+                            <!-- These generate hundreds of errors across the codebase -->
+                            <!-- <ruleset>/category/java/bestpractices.xml</ruleset> -->
+                            <!-- <ruleset>/category/java/errorprone.xml</ruleset> -->
                         </rulesets>
                     </configuration>
                     <executions>
@@ -736,7 +735,6 @@
                         <skip>${air.check.skip-license}</skip>
                         <skipExistingHeaders>true</skipExistingHeaders>
                         <failIfMissing>${air.check.fail-license}</failIfMissing>
-                        <header>${air.license.header-file}</header>
                         <mapping>
                             <java>SLASHSTAR_STYLE</java>
                             <g>SLASHSTAR_STYLE</g>
@@ -745,41 +743,46 @@
                         <properties>
                             <inceptionYear>${project.inceptionYear}</inceptionYear>
                         </properties>
-                        <headerSections>
-                            <headerSection>
-                                <key>COPYRIGHT_SECTION</key>
-                                <defaultValue>${air.license.default-value}</defaultValue>
-                                <ensureMatch>${air.license.ensure-match}</ensureMatch>
-                                <multiLineMatch>false</multiLineMatch>
-                            </headerSection>
-                        </headerSections>
                         <strictCheck>true</strictCheck>
                         <aggregate>true</aggregate>
                         <useDefaultExcludes>true</useDefaultExcludes>
                         <encoding>${project.build.sourceEncoding}</encoding>
-                        <excludes>
-                            <exclude>.*/**</exclude>
-                            <exclude>**/*.md</exclude>
-                            <exclude>**/*.sh</exclude>
-                            <exclude>**/*.txt</exclude>
-                            <exclude>**/*.thrift</exclude>
-                            <exclude>**/*.sql</exclude>
-                            <exclude>**/*.releaseBackup</exclude>
-                            <exclude>**/*.st</exclude>
-                            <exclude>**/*.raw</exclude>
-                            <exclude>**/*.ser</exclude>
-                            <exclude>**/*.html</exclude>
-                            <exclude>**/*.rst</exclude>
-                            <exclude>**/*.xml</exclude>
-                            <exclude>**/*.csv</exclude>
-                            <exclude>**/*.tsv</exclude>
-                            <exclude>**/*.properties</exclude>
-                            <exclude>**/src/license/**</exclude>
-                            <exclude>**/src/*/resources/**</exclude>
-                        </excludes>
-                        <includes>
-                            <include>src/**</include>
-                        </includes>
+                        <licenseSets>
+                            <licenseSet>
+                                <header>${air.license.header-file}</header>
+                                <headerSections>
+                                    <headerSection>
+                                        <key>COPYRIGHT_SECTION</key>
+                                        <defaultValue>${air.license.default-value}</defaultValue>
+                                        <ensureMatch>${air.license.ensure-match}</ensureMatch>
+                                        <multiLineMatch>false</multiLineMatch>
+                                    </headerSection>
+                                </headerSections>
+                                <excludes>
+                                    <exclude>.*/**</exclude>
+                                    <exclude>**/*.md</exclude>
+                                    <exclude>**/*.sh</exclude>
+                                    <exclude>**/*.txt</exclude>
+                                    <exclude>**/*.thrift</exclude>
+                                    <exclude>**/*.sql</exclude>
+                                    <exclude>**/*.releaseBackup</exclude>
+                                    <exclude>**/*.st</exclude>
+                                    <exclude>**/*.raw</exclude>
+                                    <exclude>**/*.ser</exclude>
+                                    <exclude>**/*.html</exclude>
+                                    <exclude>**/*.rst</exclude>
+                                    <exclude>**/*.xml</exclude>
+                                    <exclude>**/*.csv</exclude>
+                                    <exclude>**/*.tsv</exclude>
+                                    <exclude>**/*.properties</exclude>
+                                    <exclude>**/src/license/**</exclude>
+                                    <exclude>**/src/*/resources/**</exclude>
+                                </excludes>
+                                <includes>
+                                    <include>src/**</include>
+                                </includes>
+                            </licenseSet>
+                        </licenseSets>
                     </configuration>
                     <executions>
                         <execution>
@@ -795,7 +798,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.6</version>
+                    <version>0.8.12</version>
                     <executions>
                         <execution>
                             <id>default</id>
@@ -819,7 +822,7 @@
                 <plugin>
                     <groupId>org.gaul</groupId>
                     <artifactId>modernizer-maven-plugin</artifactId>
-                    <version>1.7.1</version>
+                    <version>2.9.0</version>
                     <configuration>
                         <skip>${air.check.skip-modernizer}</skip>
                         <failOnViolations>${air.check.fail-modernizer}</failOnViolations>
@@ -838,12 +841,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.6.0</version>
                     <dependencies>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.16</version>
+                            <version>10.19.0</version>
                         </dependency>
                         <!-- This version must match the Airbase version. It will be updated by -->
                         <!-- the Maven Release plugin. The "project.version" property cannot be -->
@@ -1020,11 +1023,6 @@
                 <artifactId>guice-assistedinject</artifactId>
                 <version>${dep.guice.version}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.inject.extensions</groupId>
-                <artifactId>guice-multibindings</artifactId>
-                <version>${dep.guice.version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-throwingproviders</artifactId>
@@ -1163,6 +1161,12 @@
                 <groupId>com.fasterxml.jackson.datatype</groupId>
                 <artifactId>jackson-datatype-guava</artifactId>
                 <version>${dep.jackson.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -1239,6 +1243,13 @@
                 <version>${dep.jmh.version}</version>
             </dependency>
 
+            <!-- Modernizer warnings -->
+            <dependency>
+                <groupId>org.gaul</groupId>
+                <artifactId>modernizer-maven-annotations</artifactId>
+                <version>2.9.0</version>
+            </dependency>
+
             <!-- Testing -->
             <dependency>
                 <groupId>org.testng</groupId>
@@ -1302,12 +1313,6 @@
                 <artifactId>objenesis</artifactId>
                 <version>${dep.objenesis.version}</version>
             </dependency>
-
-            <dependency>
-                <groupId>io.airlift</groupId>
-                <artifactId>slice</artifactId>
-                <version>${dep.slice.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/pom.xml b/pom.xml
index a10500a64..98566dcf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
 
     <properties>
         <dep.nexus-staging-plugin.version>1.6.8</dep.nexus-staging-plugin.version>
+        <dep.maven-resources-plugin.version>3.3.1</dep.maven-resources-plugin.version>
     </properties>
 
     <licenses>
@@ -62,7 +63,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
+                    <version>3.1.1</version>
                     <configuration>
                         <releaseProfiles>oss-release</releaseProfiles>
                         <mavenExecutorId>forked-path</mavenExecutorId>
@@ -78,7 +79,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.10.1</version>
                     <executions>
                         <execution>
                             <id>attach-javadocs</id>
@@ -92,7 +93,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.3.1</version>
                     <executions>
                         <execution>
                             <id>attach-sources</id>
@@ -106,7 +107,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>3.2.7</version>
                     <configuration>
                         <useAgent>true</useAgent>
                     </configuration>
@@ -148,7 +149,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>3.2.4</version>
+                        <version>3.2.7</version>
                         <configuration>
                             <gpgArguments>
                                 <arg>--pinentry-mode</arg>