diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
index 5ccde5ca07..ba3f85cc1a 100644
--- a/.github/workflows/ci-java.yml
+++ b/.github/workflows/ci-java.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 8, 11, 17, 21 ]
+        java: [ 8, 11, 17, 21]
     name: Java ${{ matrix.java }} build
     steps:
       - uses: actions/checkout@v4
diff --git a/README.md b/README.md
index ffed2f36f4..7a7e27b085 100644
--- a/README.md
+++ b/README.md
@@ -253,14 +253,14 @@ Beyond that, it is helpful to capture the following information:
 If you open a Github issue with a request for help, please include as much of the information above as possible and do not forget to sanitize any request/response data posted.
 
 ## Development
-The project depends on Java 8. To build from source and install to your local Maven cache, run the following:
+The project depends on Java 8 to 25. To build from source and install to your local Maven cache, run the following:
 
 ```shell
 $ git submodule update --init --recursive
 $ ./mvnw clean install
 ```
 
-It also depends on [Immutables][i] and won't compile in IDEs like Eclipse or IntelliJ unless you also have an enabled annotation processor. See [this guide][j] for instructions on how to configure your IDE.
+It also depends on [Immutables][i] and won't compile in IDEs like Eclipse or IntelliJ unless you also have an installed annotation processor. See [this guide][j] for instructions on how to configure your IDE.
 
 To run the integration tests, run the following:
 
diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml
index 10962f393a..0f679aa201 100644
--- a/cloudfoundry-client-reactor/pom.xml
+++ b/cloudfoundry-client-reactor/pom.xml
@@ -38,6 +38,11 @@
             <artifactId>logback-classic</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -190,5 +195,20 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk-16+</id>
+            <activation>
+                <jdk>(16,]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-subclass</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
 </project>
diff --git a/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java b/cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java
similarity index 100%
rename from cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceInstances/ReactorServiceInstancesV3Test.java
rename to cloudfoundry-client-reactor/src/test/java/org/cloudfoundry/reactor/client/v3/serviceinstances/ReactorServiceInstancesV3Test.java
diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml
index 5ab004f136..c5373d6c8b 100644
--- a/cloudfoundry-operations/pom.xml
+++ b/cloudfoundry-operations/pom.xml
@@ -41,6 +41,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
+            <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>io.projectreactor</groupId>
@@ -150,5 +151,20 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk-16+</id>
+            <activation>
+                <jdk>(16,]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-subclass</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
 </project>
diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml
index 749f52e746..51b44c1926 100644
--- a/cloudfoundry-util/pom.xml
+++ b/cloudfoundry-util/pom.xml
@@ -128,5 +128,20 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>jdk-16+</id>
+            <activation>
+                <jdk>(16,]</jdk>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.mockito</groupId>
+                    <artifactId>mockito-subclass</artifactId>
+                    <scope>test</scope>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
 
 </project>
diff --git a/cloudfoundry-util/src/main/java/org/cloudfoundry/util/ByteArrayPool.java b/cloudfoundry-util/src/main/java/org/cloudfoundry/util/ByteArrayPool.java
index 70283d3baf..39446d259e 100644
--- a/cloudfoundry-util/src/main/java/org/cloudfoundry/util/ByteArrayPool.java
+++ b/cloudfoundry-util/src/main/java/org/cloudfoundry/util/ByteArrayPool.java
@@ -29,11 +29,12 @@
 import java.util.function.Consumer;
 
 /**
- * Dynamically creates {@link byte} arrays and caches them, reusing them once they have been released.
- * <p>
- * The maximum number of byte arrays is unbounded
- * <p>
- * The default time-to-live for unused byte arrays is one minute
+ * Dynamically creates {@link Byte} arrays and caches them, reusing them once they have been
+ * released.
+ *
+ * <p>The maximum number of byte arrays is unbounded
+ *
+ * <p>The default time-to-live for unused byte arrays is one minute
  */
 public final class ByteArrayPool {
 
@@ -69,7 +70,7 @@ private ByteArrayPool(int capacity, Duration ttl) {
     /**
      * Executes a {@link Consumer} providing a pooled {@code byte} array
      *
-     * @param consumer the {@link Consumer} of the {@link byte} array
+     * @param consumer the {@link Consumer} of the {@link Byte} array
      */
     public static void withByteArray(Consumer<byte[]> consumer) {
         INSTANCE.doWithByteArray(consumer);
diff --git a/pom.xml b/pom.xml
index e8bd2cb83a..7f885cae6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,6 @@
     </modules>
 
     <properties>
-        <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <dependencies.version>2.7.17</dependencies.version>
@@ -74,6 +73,7 @@
         <wire.plugin.version>3.0.2</wire.plugin.version>
         <wire.suffix></wire.suffix>
         <spotless.version>2.44.4</spotless.version>
+        <m2e.apt.activation>disabled</m2e.apt.activation><!-- used by Eclipse -->
     </properties>
 
     <dependencyManagement>
@@ -85,7 +85,21 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.github.zafarkhaja</groupId>
                 <artifactId>java-semver</artifactId>
@@ -163,9 +177,31 @@
                             <arg>-Xlint:-processing</arg>
                             <arg>-Xlint:-serial</arg>
                         </compilerArgs>
+                        <annotationProcessorPaths>
+                            <dependency>
+                                <groupId>org.immutables</groupId>
+                                <artifactId>value</artifactId>
+                                <version>${immutables.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.fasterxml.jackson.core</groupId>
+                                <artifactId>jackson-core</artifactId>
+                                <version>${jackson.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.fasterxml.jackson.core</groupId>
+                                <artifactId>jackson-annotations</artifactId>
+                                <version>${jackson.version}</version>
+                            </dependency>
+                            <dependency>
+                                <groupId>com.fasterxml.jackson.core</groupId>
+                                <artifactId>jackson-databind</artifactId>
+                                <version>${jackson.version}</version>
+                            </dependency>
+                        </annotationProcessorPaths>
                         <showWarnings>true</showWarnings>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
+                        <source>${java.specification.version}</source>
+                        <target>${java.specification.version}</target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -222,6 +258,7 @@
             </plugins>
         </pluginManagement>
 
+        <finalName>${project.artifactId}-jdk${java.specification.version}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.jfrog.buildinfo</groupId>
@@ -336,19 +373,29 @@
         </profile>
 
         <profile>
-            <id>jdk-17</id>
+            <id>jdk-16+</id>
             <activation>
-                <jdk>17</jdk>
+                <jdk>(16,]</jdk>
             </activation>
             <properties>
-                <java.version>17</java.version>
                 <dependencies.version>3.2.1</dependencies.version>
                 <wire.version>4.9.1</wire.version>
                 <wire.plugin.version>3.0.2</wire.plugin.version>
                 <wire.suffix>-jvm</wire.suffix>
             </properties>
+            <dependencies>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-subclass</artifactId>
+                <version>${mockito.version}</version>
+            </dependency>
+            </dependencies>
             <build>
-                <finalName>${project.artifactId}-jdk17-${project.version}</finalName>
                 <plugins>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
@@ -360,45 +407,21 @@
                                 <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                             </compilerArgs>
                             <showWarnings>true</showWarnings>
-                            <source>${java.version}</source>
-                            <target>${java.version}</target>
+                            <source>${java.specification.version}</source>
+                            <target>${java.specification.version}</target>
                         </configuration>
                     </plugin>
                 </plugins>
             </build>
         </profile>
-
         <profile>
-            <id>jdk-21</id>
+            <id>jdk-23+</id>
             <activation>
-                <jdk>21</jdk>
+                <jdk>(23,]</jdk>
             </activation>
             <properties>
-                <java.version>21</java.version>
-                <dependencies.version>3.2.1</dependencies.version>
-                <wire.version>4.9.1</wire.version>
-                <wire.plugin.version>3.0.2</wire.plugin.version>
-                <wire.suffix>-jvm</wire.suffix>
+                <dependencies.version>3.5.8</dependencies.version>
             </properties>
-            <build>
-                <finalName>${project.artifactId}-jdk21-${project.version}</finalName>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
-                        <configuration>
-                            <fork>true</fork>
-                            <compilerArgs combine.children="append">
-                                <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
-                            </compilerArgs>
-                            <showWarnings>true</showWarnings>
-                            <source>${java.version}</source>
-                            <target>${java.version}</target>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
         </profile>
     </profiles>