diff --git a/Jenkinsfile-datastax b/Jenkinsfile-datastax
index af1aab6e0f4..73b977bdf9f 100644
--- a/Jenkinsfile-datastax
+++ b/Jenkinsfile-datastax
@@ -27,7 +27,7 @@ def initializeEnvironment() {
   env.GITHUB_BRANCH_URL = "${GITHUB_PROJECT_URL}/tree/${env.BRANCH_NAME}"
   env.GITHUB_COMMIT_URL = "${GITHUB_PROJECT_URL}/commit/${env.GIT_COMMIT}"
 
-  env.MAVEN_HOME = "${env.HOME}/.mvn/apache-maven-3.6.3"
+  env.MAVEN_HOME = "${env.HOME}/.mvn/apache-maven-3.8.8"
   env.PATH = "${env.MAVEN_HOME}/bin:${env.PATH}"
 
   /*
diff --git a/core/revapi.json b/core/revapi.json
index 5aa46a3ccad..f39c7d4a7c0 100644
--- a/core/revapi.json
+++ b/core/revapi.json
@@ -1,5 +1,3 @@
-// Configures Revapi (https://revapi.org/getting-started.html) to check API compatibility between
-// successive driver versions.
 {
   "revapi": {
     "java": {
@@ -7386,6 +7384,29 @@
         "old": "method <T extends java.lang.Number> com.datastax.oss.driver.api.core.type.reflect.GenericType<com.datastax.oss.driver.api.core.data.CqlVector<T>> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::vectorOf(java.lang.Class<T>)",
         "new": "method <T> com.datastax.oss.driver.api.core.type.reflect.GenericType<com.datastax.oss.driver.api.core.data.CqlVector<T>> com.datastax.oss.driver.api.core.type.reflect.GenericType<T>::vectorOf(java.lang.Class<T>)",
         "justification": "JAVA-3143: Extend driver vector support to arbitrary subtypes and fix handling of variable length types (OSS C* 5.0)"
+      },
+      {
+        "code": "java.class.nonPublicPartOfAPI",
+        "old": "class com.datastax.oss.driver.internal.core.config.typesafe.TypesafeDriverExecutionProfile.Base",
+        "justification": "CASSJAVA-102: Fix spurious complaints about optional dependencies"
+      },
+      {
+        "code": "java.class.nonPublicPartOfAPI",
+        "old": "class com.fasterxml.jackson.databind.type.TypeParser.MyTokenizer",
+        "justification": "CASSJAVA-102: Fix spurious complaints about optional dependencies"
+      },
+      {
+        "code": "java.class.nonPublicPartOfAPI",
+        "old": "class org.apache.tinkerpop.shaded.jackson.databind.type.TypeParser.MyTokenizer",
+        "justification": "CASSJAVA-102: Fix spurious complaints about optional dependencies"
+      },
+      {
+        "code": "java.class.externalClassExposedInAPI",
+        "justification": "CASSJAVA-102: Migrate revapi config into dedicated config files, ported from pom.xml"
+      },
+      {
+        "code": "java.method.varargOverloadsOnlyDifferInVarargParameter",
+        "justification": "CASSJAVA-102: Migrate revapi config into dedicated config files, ported from pom.xml"
       }
     ]
   }
diff --git a/mapper-runtime/revapi.json b/mapper-runtime/revapi.json
index 18d26a7f7e9..3dc2ea21671 100644
--- a/mapper-runtime/revapi.json
+++ b/mapper-runtime/revapi.json
@@ -1,5 +1,3 @@
-// Configures Revapi (https://revapi.org/getting-started.html) to check API compatibility between
-// successive driver versions.
 {
   "revapi": {
     "java": {
@@ -11,7 +9,7 @@
             "com\\.datastax\\.(oss|dse)\\.driver\\.internal(\\..+)?",
             "com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
             "com\\.datastax\\.oss\\.simulacron(\\..+)?",
-            // Don't re-check sibling modules that this module depends on
+            "// Don't re-check sibling modules that this module depends on",
             "com\\.datastax\\.(oss|dse)\\.driver\\.api\\.core(\\..+)?",
             "com\\.datastax\\.(oss|dse)\\.driver\\.api\\.querybuilder(\\..+)?"
           ]
@@ -22,7 +20,7 @@
       {
         "regex": true,
         "code": "java.annotation.attributeValueChanged",
-        "old": "@interface com\.datastax\.oss\.driver\.api\.mapper\.annotations\..*",
+        "old": "@interface com\\.datastax\\.oss\\.driver\\.api\\.mapper\\.annotations\\..*",
         "annotationType": "java.lang.annotation.Retention",
         "attribute": "value",
         "oldValue": "java.lang.annotation.RetentionPolicy.CLASS",
diff --git a/pom.xml b/pom.xml
index e5cfb58f94d..2cfeb65e757 100644
--- a/pom.xml
+++ b/pom.xml
@@ -561,28 +561,23 @@
         <plugin>
           <groupId>org.revapi</groupId>
           <artifactId>revapi-maven-plugin</artifactId>
-          <version>0.10.5</version>
+          <version>0.15.1</version>
           <configuration>
             <outputNonIdentifyingDifferenceInfo>false</outputNonIdentifyingDifferenceInfo>
             <versionFormat>\d+\.\d+\.\d+</versionFormat>
-            <analysisConfiguration>
-              <revapi.ignore>
-                <item>
-                  <!-- We don't consider this a problem -->
-                  <code>java.class.externalClassExposedInAPI</code>
-                </item>
-              </revapi.ignore>
-            </analysisConfiguration>
             <oldArtifacts>
               <!-- The previous release used DataStax groupId, remove this after the next release -->
               <artifact>${project.groupId}:${project.artifactId}:RELEASE</artifact>
             </oldArtifacts>
+            <analysisConfigurationFiles>
+              <file>revapi.json</file>
+            </analysisConfigurationFiles>
           </configuration>
           <dependencies>
             <dependency>
               <groupId>org.revapi</groupId>
               <artifactId>revapi-java</artifactId>
-              <version>0.22.1</version>
+              <version>0.28.4</version>
             </dependency>
           </dependencies>
         </plugin>
@@ -596,9 +591,33 @@
           <artifactId>flatten-maven-plugin</artifactId>
           <version>1.2.1</version>
         </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-enforcer-plugin</artifactId>
+          <version>3.5.0</version>
+        </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-maven</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+            <configuration>
+              <rules>
+                <requireMavenVersion>
+                  <!-- revapi 0.15.1 requires Maven version 3.8.1 -->
+                  <version>[3.8.1,)</version>
+                </requireMavenVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
@@ -901,12 +920,6 @@ limitations under the License.]]></inlineHeader>
             <goals>
               <goal>check</goal>
             </goals>
-            <configuration>
-              <analysisConfigurationFiles>
-                <!-- Present at the root of each module that doesn't skip this goal -->
-                <analysisConfigurationFile>revapi.json</analysisConfigurationFile>
-              </analysisConfigurationFiles>
-            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/query-builder/revapi.json b/query-builder/revapi.json
index c4d8aa27212..ed97379332c 100644
--- a/query-builder/revapi.json
+++ b/query-builder/revapi.json
@@ -1,5 +1,3 @@
-// Configures Revapi (https://revapi.org/getting-started.html) to check API compatibility between
-// successive driver versions.
 {
   "revapi": {
     "java": {
@@ -11,7 +9,7 @@
             "com\\.datastax\\.(oss|dse)\\.driver\\.internal(\\..+)?",
             "com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
             "org\\.assertj(\\..+)?",
-            // Don't re-check sibling modules that this module depends on
+            "// Don't re-check sibling modules that this module depends on",
             "com\\.datastax\\.(oss|dse)\\.driver\\.api\\.core(\\..+)?"
           ]
         }
@@ -2782,8 +2780,11 @@
         "code": "java.method.addedToInterface",
         "new": "method com.datastax.oss.driver.api.querybuilder.select.Select com.datastax.oss.driver.api.querybuilder.select.Select::orderByAnnOf(com.datastax.oss.driver.api.core.CqlIdentifier, com.datastax.oss.driver.api.core.data.CqlVector<?>)",
         "justification": "JAVA-3118: Add support for vector data type in Schema Builder, QueryBuilder"
+      },
+      {
+        "code": "java.method.varargOverloadsOnlyDifferInVarargParameter",
+        "justification": "CASSJAVA-102: Suppress newly-supported varargs check"
       }
     ]
   }
 }
-
diff --git a/test-infra/revapi.json b/test-infra/revapi.json
index c75a98cb4af..293d9f4d142 100644
--- a/test-infra/revapi.json
+++ b/test-infra/revapi.json
@@ -1,5 +1,3 @@
-// Configures Revapi (https://revapi.org/getting-started.html) to check API compatibility between
-// successive driver versions.
 {
   "revapi": {
     "java": {
@@ -12,7 +10,7 @@
             "com\\.datastax\\.oss\\.driver\\.shaded(\\..+)?",
             "com\\.datastax\\.oss\\.simulacron(\\..+)?",
             "org\\.assertj(\\..+)?",
-            // Don't re-check sibling modules that this module depends on
+            "// Don't re-check sibling modules that this module depends on",
             "com\\.datastax\\.(oss|dse)\\.driver\\.api\\.core(\\..+)?"
           ]
         }