diff --git a/NEXT_CHANGELOG.md b/NEXT_CHANGELOG.md
index 5c389f387..968c554aa 100644
--- a/NEXT_CHANGELOG.md
+++ b/NEXT_CHANGELOG.md
@@ -14,4 +14,6 @@
 
 ### Internal Changes
 
+- Bumped JaCoCo to 0.8.13 and overrode Mockito's transitive Byte Buddy to 1.17.5 so that `mvn clean test` works on JDK 25 (used by the code-generator's automated environment). No runtime or API impact.
+
 ### API Changes
diff --git a/databricks-sdk-java/lockfile.json b/databricks-sdk-java/lockfile.json
index 170bc7965..3b1250575 100644
--- a/databricks-sdk-java/lockfile.json
+++ b/databricks-sdk-java/lockfile.json
@@ -737,9 +737,9 @@
       "artifactId": "commons-configuration2",
       "version": "2.13.0",
       "checksumAlgorithm": "SHA-256",
-      "checksum": "7622799663317f95c81019b32b39e0c82e42b388f00abe6e5ab26489d90d9a6b",
+      "checksum": "48957fc3a0d9fbd221fe4f5ff6d0294ce6646ea139793c36706703da59402683",
       "scope": "compile",
-      "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-configuration2/2.13.0/commons-configuration2-2.13.0.jar",
+      "resolved": "",
       "selectedVersion": "2.13.0",
       "included": true,
       "id": "org.apache.commons:commons-configuration2:2.13.0",
@@ -747,56 +747,56 @@
         {
           "groupId": "commons-logging",
           "artifactId": "commons-logging",
-          "version": "1.3.5",
+          "version": "1.3.2",
           "checksumAlgorithm": "SHA-256",
-          "checksum": "6d7a744e4027649fbb50895df9497d109f98c766a637062fe8d2eabbb3140ba4",
+          "checksum": "6b858424f518015f32bfcd1183a373f4a827d72d026b6031da0c91cf0e8f3489",
           "scope": "compile",
-          "resolved": "https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.5/commons-logging-1.3.5.jar",
-          "selectedVersion": "1.3.5",
+          "resolved": "https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.3.2/commons-logging-1.3.2.jar",
+          "selectedVersion": "1.3.2",
           "included": true,
-          "id": "commons-logging:commons-logging:1.3.5",
+          "id": "commons-logging:commons-logging:1.3.2",
           "parent": "org.apache.commons:commons-configuration2:2.13.0",
           "children": []
         },
         {
           "groupId": "org.apache.commons",
           "artifactId": "commons-lang3",
-          "version": "3.20.0",
+          "version": "3.14.0",
           "checksumAlgorithm": "SHA-256",
-          "checksum": "69e5c9fa35da7a51a5fd2099dfe56a2d8d32cf233e2f6d770e796146440263f4",
+          "checksum": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
           "scope": "compile",
-          "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.20.0/commons-lang3-3.20.0.jar",
-          "selectedVersion": "3.20.0",
+          "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar",
+          "selectedVersion": "3.14.0",
           "included": true,
-          "id": "org.apache.commons:commons-lang3:3.20.0",
+          "id": "org.apache.commons:commons-lang3:3.14.0",
           "parent": "org.apache.commons:commons-configuration2:2.13.0",
           "children": []
         },
         {
           "groupId": "org.apache.commons",
           "artifactId": "commons-text",
-          "version": "1.14.0",
+          "version": "1.12.0",
           "checksumAlgorithm": "SHA-256",
-          "checksum": "121fce2282910c8f0c3ba793a5436b31beb710423cbe2d574a3fb7a73c508e92",
+          "checksum": "de023257ff166044a56bd1aa9124e843cd05dac5806cc705a9311f3556d5a15f",
           "scope": "compile",
-          "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.14.0/commons-text-1.14.0.jar",
-          "selectedVersion": "1.14.0",
+          "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-text/1.12.0/commons-text-1.12.0.jar",
+          "selectedVersion": "1.12.0",
           "included": true,
-          "id": "org.apache.commons:commons-text:1.14.0",
+          "id": "org.apache.commons:commons-text:1.12.0",
           "parent": "org.apache.commons:commons-configuration2:2.13.0",
           "children": [
             {
               "groupId": "org.apache.commons",
               "artifactId": "commons-lang3",
-              "version": "3.18.0",
+              "version": "3.14.0",
               "checksumAlgorithm": "SHA-256",
-              "checksum": "4eeeae8d20c078abb64b015ec158add383ac581571cddc45c68f0c9ae0230720",
+              "checksum": "7b96bf3ee68949abb5bc465559ac270e0551596fa34523fddf890ec418dde13c",
               "scope": "compile",
-              "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.18.0/commons-lang3-3.18.0.jar",
-              "selectedVersion": "3.20.0",
+              "resolved": "https://repo.maven.apache.org/maven2/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar",
+              "selectedVersion": "3.14.0",
               "included": false,
-              "id": "org.apache.commons:commons-lang3:3.18.0",
-              "parent": "org.apache.commons:commons-text:1.14.0",
+              "id": "org.apache.commons:commons-lang3:3.14.0",
+              "parent": "org.apache.commons:commons-text:1.12.0",
               "children": []
             }
           ]
@@ -837,7 +837,7 @@
           "checksum": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636",
           "scope": "compile",
           "resolved": "https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar",
-          "selectedVersion": "1.3.5",
+          "selectedVersion": "1.3.2",
           "included": false,
           "id": "commons-logging:commons-logging:1.2",
           "parent": "org.apache.httpcomponents:httpclient:4.5.14",
@@ -1129,28 +1129,28 @@
             {
               "groupId": "net.bytebuddy",
               "artifactId": "byte-buddy",
-              "version": "1.12.19",
+              "version": "1.17.5",
               "checksumAlgorithm": "SHA-256",
-              "checksum": "030704139e46f32c38d27060edee9e0676b0a0fff8a8be53461515154ba8a7be",
+              "checksum": "71568c9f8396677219f650268fbf6493ded484edcdbdf2dae6129ca5be81e8db",
               "scope": "test",
-              "resolved": "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.12.19/byte-buddy-1.12.19.jar",
-              "selectedVersion": "1.12.19",
+              "resolved": "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy/1.17.5/byte-buddy-1.17.5.jar",
+              "selectedVersion": "1.17.5",
               "included": true,
-              "id": "net.bytebuddy:byte-buddy:1.12.19",
+              "id": "net.bytebuddy:byte-buddy:1.17.5",
               "parent": "org.mockito:mockito-core:4.11.0",
               "children": []
             },
             {
               "groupId": "net.bytebuddy",
               "artifactId": "byte-buddy-agent",
-              "version": "1.12.19",
+              "version": "1.17.5",
               "checksumAlgorithm": "SHA-256",
-              "checksum": "3a70240de7cdcde04e7c504c2327d7035b9c25ae0206881e3bf4e6798a273ed8",
+              "checksum": "c5b9334ad82e632f6af60df22bbbdbbb62cee04877f4f43c38ba04aed9bd9901",
               "scope": "test",
-              "resolved": "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.12.19/byte-buddy-agent-1.12.19.jar",
-              "selectedVersion": "1.12.19",
+              "resolved": "https://repo.maven.apache.org/maven2/net/bytebuddy/byte-buddy-agent/1.17.5/byte-buddy-agent-1.17.5.jar",
+              "selectedVersion": "1.17.5",
               "included": true,
-              "id": "net.bytebuddy:byte-buddy-agent:1.12.19",
+              "id": "net.bytebuddy:byte-buddy-agent:1.17.5",
               "parent": "org.mockito:mockito-core:4.11.0",
               "children": []
             },
@@ -1274,7 +1274,7 @@
   "metaData": {
     "environment": {
       "osName": "Linux",
-      "mavenVersion": "3.9.14",
+      "mavenVersion": "3.9.11",
       "javaVersion": "11.0.30"
     },
     "config": {
diff --git a/databricks-sdk-java/pom.xml b/databricks-sdk-java/pom.xml
index 2e1e3d679..c2aa7b430 100644
--- a/databricks-sdk-java/pom.xml
+++ b/databricks-sdk-java/pom.xml
@@ -10,6 +10,11 @@
   <artifactId>databricks-sdk-java</artifactId>
   <name>Databricks SDK for Java</name>
   <properties>
+    <!-- Override Mockito's transitive Byte Buddy. Mockito 4.11 ships
+         Byte Buddy ~1.12, which only supports class file format up to
+         Java 20; running tests on JDK 25 fails with `Java 25 (69) is
+         not supported`. 1.17.5 supports JDK 25 and stays Java 8 compatible. -->
+    <bytebuddy.version>1.17.5</bytebuddy.version>
     <httpclient.version>4.5.14</httpclient.version>
     <jackson.version>2.18.6</jackson.version>
     <junit-bom.version>5.10.0</junit-bom.version>
@@ -29,6 +34,16 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy</artifactId>
+        <version>${bytebuddy.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>net.bytebuddy</groupId>
+        <artifactId>byte-buddy-agent</artifactId>
+        <version>${bytebuddy.version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <dependencies>
diff --git a/lockfile.json b/lockfile.json
index 66b6173fb..495ebea7d 100644
--- a/lockfile.json
+++ b/lockfile.json
@@ -7,9 +7,9 @@
   "mavenPlugins": [],
   "metaData": {
     "environment": {
-      "osName": "Mac OS X",
-      "mavenVersion": "3.9.14",
-      "javaVersion": "11.0.12"
+      "osName": "Linux",
+      "mavenVersion": "3.9.11",
+      "javaVersion": "11.0.30"
     },
     "config": {
       "includeMavenPlugins": false,
diff --git a/pom.xml b/pom.xml
index e41bc4ba5..5ff09bad3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,11 @@
     <url>https://github.com/databricks/databricks-sdk-java/blob/main/.github/workflows/push.yml</url>
   </ciManagement>
   <properties>
-    <jacoco.version>0.8.10</jacoco.version>
+    <!-- 0.8.13 supports Java 24 officially and instruments JDK 25 class
+         files in practice (next JaCoCo release should add 25 officially).
+         Required for the code-generator's JDK 25 environment running
+         `mvn clean test` with JaCoCo's prepare-agent attached. -->
+    <jacoco.version>0.8.13</jacoco.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <build>