diff --git a/Jenkinsfile b/Jenkinsfile
index fa632c1..2895c3e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * ao-encoding - High performance streaming character encoding.
- * Copyright (C) 2021, 2022, 2023, 2024  AO Industries, Inc.
+ * Copyright (C) 2021, 2022, 2023, 2024, 2025  AO Industries, Inc.
  *     support@aoindustries.com
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -117,9 +117,6 @@ def upstreamProjects = [
  * mavenOpts            The Maven Java options.                                           *
  *                      Defaults to '-Djansi.force' for colorful logs                     *
  *                                                                                        *
- * mavenOptsJdk16       The Maven Java options for JDK 16+.                               *
- *                      Defaults to exporting Java compiler for rewrite-maven-plugin.     *
- *                                                                                        *
  * extraProfiles        An array of additional profiles to pass to Maven.                 *
  *                      Defaults to []                                                    *
  *                                                                                        *
@@ -445,10 +442,6 @@ if (!binding.hasVariable('maven')) {
 if (!binding.hasVariable('mavenOpts')) {
   binding.setVariable('mavenOpts', '-Djansi.force')
 }
-if (!binding.hasVariable('mavenOptsJdk16')) {
-  // See https://docs.openrewrite.org/getting-started/getting-started#running-on-jdk-16-and-newer
-  binding.setVariable('mavenOptsJdk16', '--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED')
-}
 if (!binding.hasVariable('extraProfiles')) {
   binding.setVariable('extraProfiles', [])
 }
@@ -796,7 +789,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${jdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$jdk"
                 ) {
@@ -851,7 +844,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${testJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$testJdk"
                 ) {
@@ -876,7 +869,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('SonarQube analysis') {
@@ -892,7 +885,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('Quality Gate') {
@@ -939,7 +932,7 @@ or any build that adds or removes build artifacts."""
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Make sure working tree not modified by build or test
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
@@ -960,7 +953,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     sh moveSurefireReportsScript()
     withMaven(
       maven: maven,
-      mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+      mavenOpts: mavenOpts,
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
@@ -975,13 +968,13 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+        mavenOpts: mavenOpts,
         mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
         jdk: "jdk-$deployJdk"
       ) {
diff --git a/book/Jenkinsfile b/book/Jenkinsfile
index a38b7d0..7b3a5ae 100644
--- a/book/Jenkinsfile
+++ b/book/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * ao-encoding - High performance streaming character encoding.
- * Copyright (C) 2021, 2022, 2023, 2024  AO Industries, Inc.
+ * Copyright (C) 2021, 2022, 2023, 2024, 2025  AO Industries, Inc.
  *     support@aoindustries.com
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -126,9 +126,6 @@ def upstreamProjects = [
  * mavenOpts            The Maven Java options.                                           *
  *                      Defaults to '-Djansi.force' for colorful logs                     *
  *                                                                                        *
- * mavenOptsJdk16       The Maven Java options for JDK 16+.                               *
- *                      Defaults to exporting Java compiler for rewrite-maven-plugin.     *
- *                                                                                        *
  * extraProfiles        An array of additional profiles to pass to Maven.                 *
  *                      Defaults to []                                                    *
  *                                                                                        *
@@ -454,10 +451,6 @@ if (!binding.hasVariable('maven')) {
 if (!binding.hasVariable('mavenOpts')) {
   binding.setVariable('mavenOpts', '-Djansi.force')
 }
-if (!binding.hasVariable('mavenOptsJdk16')) {
-  // See https://docs.openrewrite.org/getting-started/getting-started#running-on-jdk-16-and-newer
-  binding.setVariable('mavenOptsJdk16', '--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED')
-}
 if (!binding.hasVariable('extraProfiles')) {
   binding.setVariable('extraProfiles', [])
 }
@@ -805,7 +798,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${jdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$jdk"
                 ) {
@@ -860,7 +853,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${testJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$testJdk"
                 ) {
@@ -885,7 +878,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('SonarQube analysis') {
@@ -901,7 +894,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('Quality Gate') {
@@ -948,7 +941,7 @@ or any build that adds or removes build artifacts."""
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Make sure working tree not modified by build or test
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
@@ -969,7 +962,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     sh moveSurefireReportsScript()
     withMaven(
       maven: maven,
-      mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+      mavenOpts: mavenOpts,
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
@@ -984,13 +977,13 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+        mavenOpts: mavenOpts,
         mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
         jdk: "jdk-$deployJdk"
       ) {
diff --git a/devel/Jenkinsfile b/devel/Jenkinsfile
index 7818a81..09a6737 100644
--- a/devel/Jenkinsfile
+++ b/devel/Jenkinsfile
@@ -1,7 +1,7 @@
 #!/usr/bin/env groovy
 /*
  * ao-encoding - High performance streaming character encoding.
- * Copyright (C) 2021, 2022, 2023, 2024  AO Industries, Inc.
+ * Copyright (C) 2021, 2022, 2023, 2024, 2025  AO Industries, Inc.
  *     support@aoindustries.com
  *     7262 Bull Pen Cir
  *     Mobile, AL 36695
@@ -115,9 +115,6 @@ def upstreamProjects = [
  * mavenOpts            The Maven Java options.                                           *
  *                      Defaults to '-Djansi.force' for colorful logs                     *
  *                                                                                        *
- * mavenOptsJdk16       The Maven Java options for JDK 16+.                               *
- *                      Defaults to exporting Java compiler for rewrite-maven-plugin.     *
- *                                                                                        *
  * extraProfiles        An array of additional profiles to pass to Maven.                 *
  *                      Defaults to []                                                    *
  *                                                                                        *
@@ -443,10 +440,6 @@ if (!binding.hasVariable('maven')) {
 if (!binding.hasVariable('mavenOpts')) {
   binding.setVariable('mavenOpts', '-Djansi.force')
 }
-if (!binding.hasVariable('mavenOptsJdk16')) {
-  // See https://docs.openrewrite.org/getting-started/getting-started#running-on-jdk-16-and-newer
-  binding.setVariable('mavenOptsJdk16', '--add-exports jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED')
-}
 if (!binding.hasVariable('extraProfiles')) {
   binding.setVariable('extraProfiles', [])
 }
@@ -794,7 +787,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${jdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$jdk"
                 ) {
@@ -849,7 +842,7 @@ or any build that adds or removes build artifacts."""
               dir(projectDir) {
                 withMaven(
                   maven: maven,
-                  mavenOpts: "${testJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+                  mavenOpts: mavenOpts,
                   mavenLocalRepo: ".m2/repository-jdk-$jdk",
                   jdk: "jdk-$testJdk"
                 ) {
@@ -874,7 +867,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('SonarQube analysis') {
@@ -890,7 +883,7 @@ or any build that adds or removes build artifacts."""
       steps {
         // Steps moved to separate function to avoid "Method too large"
         // See https://stackoverflow.com/a/47631522
-        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon)
+        sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon)
       }
     }
     stage('Quality Gate') {
@@ -937,7 +930,7 @@ or any build that adds or removes build artifacts."""
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Make sure working tree not modified by build or test
   sh checkTreeUnmodifiedScriptBuild(niceCmd)
   dir(projectDir) {
@@ -958,7 +951,7 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
     sh moveSurefireReportsScript()
     withMaven(
       maven: maven,
-      mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+      mavenOpts: mavenOpts,
       mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
       jdk: "jdk-$deployJdk"
     ) {
@@ -973,13 +966,13 @@ void deploySteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk1
 
 // Steps moved to separate function to avoid "Method too large"
 // See https://stackoverflow.com/a/47631522
-void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mavenOptsJdk16, mvnCommon) {
+void sonarQubeAnalysisSteps(niceCmd, projectDir, deployJdk, maven, mavenOpts, mvnCommon) {
   // Not doing shallow: sh "${niceCmd}git fetch --unshallow || true" // SonarQube does not currently support shallow fetch
   dir(projectDir) {
     withSonarQubeEnv(installationName: 'AO SonarQube') {
       withMaven(
         maven: maven,
-        mavenOpts: "${deployJdk == '11' ? mavenOpts : "$mavenOpts $mavenOptsJdk16"}",
+        mavenOpts: mavenOpts,
         mavenLocalRepo: ".m2/repository-jdk-$deployJdk",
         jdk: "jdk-$deployJdk"
       ) {