diff --git a/build.gradle b/build.gradle
index 9ee0f3d1675..24819990184 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
 
 plugins {
     // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
-    id 'com.github.johnrengelman.shadow' version '8.1.0'
+    id 'com.github.johnrengelman.shadow' version '8.1.1'
     // https://plugins.gradle.org/plugin/de.undercouch.download
     id 'de.undercouch.download' version '5.4.0'
     id 'java'
diff --git a/checker/build.gradle b/checker/build.gradle
index 113d6471166..bf15a941ace 100644
--- a/checker/build.gradle
+++ b/checker/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'java-library'
-
+    id 'base'
     // https://github.com/n0mer/gradle-git-properties ; target is: generateGitProperties
     id 'com.gorylenko.gradle-git-properties' version '2.4.1'
 }
@@ -172,7 +172,9 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 task checkerJar(type: ShadowJar, dependsOn: compileJava, group: 'Build') {
     description "Builds checker-${project.version}.jar with all dependencies except checker-qual and checker-util."
     includeEmptyDirs = false
-    archivesBaseName = 'checker'
+    base {
+        archivesName = 'checker'
+    }
     archiveClassifier = ''
 
     from shadowJar.source
diff --git a/dataflow/build.gradle b/dataflow/build.gradle
index 4b6e8fa1a46..4551b65db48 100644
--- a/dataflow/build.gradle
+++ b/dataflow/build.gradle
@@ -1,5 +1,6 @@
 plugins {
     id 'java-library'
+    id 'base'
 }
 
 dependencies {
@@ -28,7 +29,9 @@ def createDataflowShaded(shadedPkgName) {
     tasks.create(name: "dataflow${shadedPkgName}Jar", type: ShadowJar, dependsOn: compileJava, group: 'Build') {
         description "Builds dataflow-${shadedPkgName}.jar."
         includeEmptyDirs = false
-        archivesBaseName = "dataflow-${shadedPkgName}"
+        base {
+            archivesName = "dataflow-${shadedPkgName}"
+        }
         // Without this line, the Maven artifact will have the classifier "all".
         archiveClassifier.set('')