diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index d5e3d74b2d..19221d8d79 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
-    compile "org.apache.portals.pluto:pluto-util:${plutoVersion}"
+    implementation "org.apache.portals.pluto:pluto-util:${plutoVersion}"
 
     compileOnly "org.jasig.portal:uPortal-tools:${uPortalVersion}"
 }
diff --git a/buildSrc/src/main/groovy/org/apereo/portal/start/shell/PortalShellInvoker.groovy b/buildSrc/src/main/groovy/org/apereo/portal/start/shell/PortalShellInvoker.groovy
index b64acb8f24..99e480d5e7 100644
--- a/buildSrc/src/main/groovy/org/apereo/portal/start/shell/PortalShellInvoker.groovy
+++ b/buildSrc/src/main/groovy/org/apereo/portal/start/shell/PortalShellInvoker.groovy
@@ -12,7 +12,7 @@ class PortalShellInvoker {
         File serverBase = project.rootProject.file(project.rootProject.ext['buildProperties'].getProperty('server.base'))
         File deployDir = new File (serverBase, "webapps/${project.name}")
 
-        File libsDir = project.rootProject.file(project.rootProject.getProperty('libsDir'))
+        File libsDir = new File(project.rootProject.buildDir, 'libs')
         libsDir.mkdirs()
         project.configurations.shell.files.each {
             project.ant.copy(todir: libsDir, file: it.absolutePath)
diff --git a/buildSrc/src/main/groovy/scaldingspoon/gradle/WarOverlayPlugin.groovy b/buildSrc/src/main/groovy/scaldingspoon/gradle/WarOverlayPlugin.groovy
index 12b726ff77..0d993e561b 100644
--- a/buildSrc/src/main/groovy/scaldingspoon/gradle/WarOverlayPlugin.groovy
+++ b/buildSrc/src/main/groovy/scaldingspoon/gradle/WarOverlayPlugin.groovy
@@ -23,7 +23,7 @@ class WarOverlayPlugin implements Plugin<Project> {
                 war.doFirst {
                     war.classpath = war.classpath.filter { !it.name.endsWith(".war") }
 
-                    war.project.configurations.runtime.each {
+                    war.project.configurations.runtimeClasspath.each {
                         if (it.name.endsWith(".war")) {
                             def fileList = war.project.zipTree(it)
                             if (project.convention.plugins.warOverlay.includeWarJars) {
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..d64cd49177 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 53b9e3802b..a595206642 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 1b6c787337..1aa94a4269 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
@@ -205,6 +214,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32c4..93e3f59f13 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/overlays/Announcements/build.gradle b/overlays/Announcements/build.gradle
index b98a5c0469..f2ee6c6fd8 100644
--- a/overlays/Announcements/build.gradle
+++ b/overlays/Announcements/build.gradle
@@ -5,12 +5,11 @@ apply plugin: GradleImportExportPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:Announcements:${announcementsPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:Announcements:${announcementsPortletVersion}@war"
 }
 
 war {
-    archiveName 'Announcements.war'
+    archiveFileName.set('Announcements.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
@@ -36,7 +35,6 @@ war {
 import org.apereo.portal.start.shell.PortalShellInvoker
 
 dependencies {
-    impexp configurations.jdbc
     impexp "${portletApiDependency}"
     impexp "${servletApiDependency}"
 
diff --git a/overlays/BookmarksPortlet/build.gradle b/overlays/BookmarksPortlet/build.gradle
index 0990fda4f7..85b32294dc 100644
--- a/overlays/BookmarksPortlet/build.gradle
+++ b/overlays/BookmarksPortlet/build.gradle
@@ -3,13 +3,12 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:BookmarksPortlet:${bookmarksPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:BookmarksPortlet:${bookmarksPortletVersion}@war"
     jdbc "org.jasig.portal:uPortal-hibernate3-dialects:${uPortalVersion}"
 }
 
 war {
-    archiveName 'BookmarksPortlet.war'
+    archiveFileName.set('BookmarksPortlet.war')
     exclude 'WEB-INF/tags/uwfn.tld'
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
diff --git a/overlays/CalendarPortlet/build.gradle b/overlays/CalendarPortlet/build.gradle
index 8feb43e9f5..4f9b4cf90f 100644
--- a/overlays/CalendarPortlet/build.gradle
+++ b/overlays/CalendarPortlet/build.gradle
@@ -5,12 +5,11 @@ apply plugin: GradleImportExportPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:CalendarPortlet:${calendarPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:CalendarPortlet:${calendarPortletVersion}@war"
 }
 
 war {
-    archiveName 'CalendarPortlet.war'
+    archiveFileName.set('CalendarPortlet.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
@@ -36,7 +35,6 @@ war {
 import org.apereo.portal.start.shell.PortalShellInvoker
 
 dependencies {
-    impexp configurations.jdbc
     impexp "${portletApiDependency}"
     impexp "${servletApiDependency}"
 
diff --git a/overlays/FeedbackPortlet/build.gradle b/overlays/FeedbackPortlet/build.gradle
index 9c3943e33a..21ad40f762 100644
--- a/overlays/FeedbackPortlet/build.gradle
+++ b/overlays/FeedbackPortlet/build.gradle
@@ -3,12 +3,11 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:FeedbackPortlet:${feedbackPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:FeedbackPortlet:${feedbackPortletVersion}@war"
 }
 
 war {
-    archiveName 'FeedbackPortlet.war'
+    archiveFileName.set('FeedbackPortlet.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
diff --git a/overlays/FunctionalTestsPortlet/build.gradle b/overlays/FunctionalTestsPortlet/build.gradle
index a1dee10e88..a1bb4427cc 100644
--- a/overlays/FunctionalTestsPortlet/build.gradle
+++ b/overlays/FunctionalTestsPortlet/build.gradle
@@ -3,9 +3,9 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:FunctionalTestsPortlet:${functionalTestsPortletVersion}@war"
+    runtimeOnly "org.jasig.portlet:FunctionalTestsPortlet:${functionalTestsPortletVersion}@war"
 }
 
 war {
-    archiveName 'FunctionalTestsPortlet.war'
+    archiveFileName.set('FunctionalTestsPortlet.war')
 }
diff --git a/overlays/NewsReaderPortlet/build.gradle b/overlays/NewsReaderPortlet/build.gradle
index 9dcd3ce168..b8bd740d4f 100644
--- a/overlays/NewsReaderPortlet/build.gradle
+++ b/overlays/NewsReaderPortlet/build.gradle
@@ -5,13 +5,12 @@ apply plugin: GradleImportExportPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:NewsReaderPortlet:${newsReaderPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:NewsReaderPortlet:${newsReaderPortletVersion}@war"
     jdbc "org.jasig.portal:uPortal-hibernate3-dialects:${uPortalVersion}"
 }
 
 war {
-    archiveName 'NewsReaderPortlet.war'
+    archiveFileName.set('NewsReaderPortlet.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
@@ -37,7 +36,6 @@ war {
 import org.apereo.portal.start.shell.PortalShellInvoker
 
 dependencies {
-    impexp configurations.jdbc
     impexp "${portletApiDependency}"
     impexp "${servletApiDependency}"
 }
diff --git a/overlays/NotificationPortlet/build.gradle b/overlays/NotificationPortlet/build.gradle
index a7ac7025bf..9c963ac158 100644
--- a/overlays/NotificationPortlet/build.gradle
+++ b/overlays/NotificationPortlet/build.gradle
@@ -3,12 +3,11 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet.notification:notification-portlet-webapp:${notificationPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet.notification:notification-portlet-webapp:${notificationPortletVersion}@war"
 }
 
 war {
-    archiveName 'NotificationPortlet.war'
+    archiveFileName.set('NotificationPortlet.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
diff --git a/overlays/ResourceServingWebapp/build.gradle b/overlays/ResourceServingWebapp/build.gradle
index c067541055..c025f42bc3 100644
--- a/overlays/ResourceServingWebapp/build.gradle
+++ b/overlays/ResourceServingWebapp/build.gradle
@@ -1,9 +1,9 @@
 dependencies {
-    runtime "org.jasig.resourceserver:resource-server-webapp:${resourceServerVersion}@war"
-    runtime "javax.xml.bind:jaxb-api:2.3.1"
-    runtime "com.sun.xml.bind:jaxb-impl:2.3.3"
+    runtimeOnly "org.jasig.resourceserver:resource-server-webapp:${resourceServerVersion}@war"
+    runtimeOnly "javax.xml.bind:jaxb-api:2.3.1"
+    runtimeOnly "com.sun.xml.bind:jaxb-impl:2.3.3"
 }
 
 war {
-    archiveName 'ResourceServingWebapp.war'
+    archiveFileName.set('ResourceServingWebapp.war')
 }
diff --git a/overlays/SimpleContentPortlet/build.gradle b/overlays/SimpleContentPortlet/build.gradle
index 283d3889a7..bb97c6347c 100644
--- a/overlays/SimpleContentPortlet/build.gradle
+++ b/overlays/SimpleContentPortlet/build.gradle
@@ -5,13 +5,12 @@ apply plugin: GradleImportExportPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet.simplecontent:SimpleContentPortlet:${simpleContentPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet.simplecontent:SimpleContentPortlet:${simpleContentPortletVersion}@war"
     jdbc "org.jasig.portal:uPortal-hibernate4-dialects:${uPortalVersion}"
 }
 
 war {
-    archiveName 'SimpleContentPortlet.war'
+    archiveFileName.set('SimpleContentPortlet.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
@@ -37,7 +36,6 @@ war {
 import org.apereo.portal.start.shell.PortalShellInvoker
 
 dependencies {
-    impexp configurations.jdbc
     impexp "${portletApiDependency}"
     impexp "${servletApiDependency}"
 }
diff --git a/overlays/WebProxyPortlet/build.gradle b/overlays/WebProxyPortlet/build.gradle
index afe75c05bd..0148ef0c09 100644
--- a/overlays/WebProxyPortlet/build.gradle
+++ b/overlays/WebProxyPortlet/build.gradle
@@ -3,9 +3,9 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet.proxy:WebProxyPortlet:${webProxyPortletVersion}@war"
+    runtimeOnly "org.jasig.portlet.proxy:WebProxyPortlet:${webProxyPortletVersion}@war"
 }
 
 war {
-    archiveName 'WebProxyPortlet.war'
+    archiveFileName.set('WebProxyPortlet.war')
 }
diff --git a/overlays/basiclti-portlet/build.gradle b/overlays/basiclti-portlet/build.gradle
index 1b1d0d08f1..6e190ff694 100644
--- a/overlays/basiclti-portlet/build.gradle
+++ b/overlays/basiclti-portlet/build.gradle
@@ -3,9 +3,9 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:basiclti-portlet:${basicltiPortletVersion}@war"
+    runtimeOnly "org.jasig.portlet:basiclti-portlet:${basicltiPortletVersion}@war"
 }
 
 war {
-    archiveName 'basiclti-portlet.war'
+    archiveFileName.set('basiclti-portlet.war')
 }
diff --git a/overlays/build.gradle b/overlays/build.gradle
index 39e9ece40b..126e46b0cd 100644
--- a/overlays/build.gradle
+++ b/overlays/build.gradle
@@ -2,7 +2,6 @@ import scaldingspoon.gradle.WarOverlayPlugin
 
 subprojects {
 
-    apply plugin: 'maven'
     apply plugin: WarOverlayPlugin
     apply plugin: org.apereo.portal.start.gradle.plugins.GradleTomcatDeployPlugin
 
@@ -22,6 +21,10 @@ subprojects {
         jdbc
         shell
         impexp
+        // Gradle 8: Configuration-as-dependency is no longer allowed;
+        // use extendsFrom so overlay deps inherit jdbc drivers
+        implementation.extendsFrom jdbc
+        impexp.extendsFrom jdbc
     }
 
     dependencies {
diff --git a/overlays/cas-proxy-test-portlet/build.gradle b/overlays/cas-proxy-test-portlet/build.gradle
index c46f6700eb..10587a8130 100644
--- a/overlays/cas-proxy-test-portlet/build.gradle
+++ b/overlays/cas-proxy-test-portlet/build.gradle
@@ -3,9 +3,9 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:cas-proxy-test-portlet:${casProxyTestPortletVersion}@war"
+    runtimeOnly "org.jasig.portlet:cas-proxy-test-portlet:${casProxyTestPortletVersion}@war"
 }
 
 war {
-    archiveName 'cas-proxy-test-portlet.war'
+    archiveFileName.set('cas-proxy-test-portlet.war')
 }
diff --git a/overlays/cas/build.gradle b/overlays/cas/build.gradle
index 5ee2585aba..096d9fc32c 100644
--- a/overlays/cas/build.gradle
+++ b/overlays/cas/build.gradle
@@ -1,25 +1,24 @@
 apply plugin: 'java'
 
 dependencies {
-    runtime("commons-dbcp:commons-dbcp:${casCommonsDbcpVersion}") {
+    runtimeOnly("commons-dbcp:commons-dbcp:${casCommonsDbcpVersion}") {
         exclude group: 'xml-apis', module: 'xml-apis'
         exclude group: 'xerces', module: 'xercesImpl'
     }
-    runtime "net.sf.ehcache:ehcache-core:${casEhcacheVersion}"
-    runtime "org.aspectj:aspectjrt:1.9.7"
-    runtime "org.aspectj:aspectjweaver:1.9.7"
-    runtime "org.jasig.cas:cas-server-webapp:${casServerVersion}@war"
-    runtime("org.jasig.cas:cas-server-extension-clearpass:${casServerVersion}") {
+    runtimeOnly "net.sf.ehcache:ehcache-core:${casEhcacheVersion}"
+    runtimeOnly "org.aspectj:aspectjrt:1.9.7"
+    runtimeOnly "org.aspectj:aspectjweaver:1.9.7"
+    runtimeOnly "org.jasig.cas:cas-server-webapp:${casServerVersion}@war"
+    runtimeOnly("org.jasig.cas:cas-server-extension-clearpass:${casServerVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'javax.xml', module: 'xmldsig'
     }
-    runtime "xerces:xercesImpl:${casXercesImplVersion}"
+    runtimeOnly "xerces:xercesImpl:${casXercesImplVersion}"
 
-    compile "commons-codec:commons-codec:${casCommonsCodecVersion}"
-    compile "commons-collections:commons-collections:${casCommonsCollectionsVersion}"
-    compile "org.jasypt:jasypt:${jasyptVersion}"
-    compile "org.slf4j:slf4j-api:${casSlf4jVersion}"
-    compile configurations.jdbc
+    implementation "commons-codec:commons-codec:${casCommonsCodecVersion}"
+    implementation "commons-collections:commons-collections:${casCommonsCollectionsVersion}"
+    implementation "org.jasypt:jasypt:${jasyptVersion}"
+    implementation "org.slf4j:slf4j-api:${casSlf4jVersion}"
 
     compileOnly("org.jasig.cas:cas-server-core:${casServerVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
@@ -30,17 +29,17 @@ dependencies {
     }
     compileOnly servletApiDependency
 
-    testCompile group: 'junit', name: 'junit', version: '4.13.2'
-    testCompile group: 'org.easymock', name: 'easymock', version: '5.3.0'
-    testCompile("org.jasig.cas:cas-server-core:${casServerVersion}") {
+    testImplementation group: 'junit', name: 'junit', version: '4.13.2'
+    testImplementation group: 'org.easymock', name: 'easymock', version: '5.3.0'
+    testImplementation("org.jasig.cas:cas-server-core:${casServerVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'javax.xml', module: 'xmldsig'
     }
-    testCompile group: 'org.springframework', name: 'spring-jdbc', version: "${casSpringVersion}"
+    testImplementation group: 'org.springframework', name: 'spring-jdbc', version: "${casSpringVersion}"
 }
 
 war {
-    archiveName 'cas.war'
+    archiveFileName.set('cas.war')
     exclude 'WEB-INF/lib/cas-client-core-3.2.1.jar'
     exclude 'WEB-INF/lib/commons-collections*jar'
     exclude 'WEB-INF/lib/xml-apis-1.0.b2.jar'
diff --git a/overlays/esup-filemanager/build.gradle b/overlays/esup-filemanager/build.gradle
index 74a54f6af6..02d16908a0 100644
--- a/overlays/esup-filemanager/build.gradle
+++ b/overlays/esup-filemanager/build.gradle
@@ -3,9 +3,9 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.esupportail.portlet.filemanager:esup-filemanager:${esupFilemanagerPortletVersion}@war"
+    runtimeOnly "org.esupportail.portlet.filemanager:esup-filemanager:${esupFilemanagerPortletVersion}@war"
 }
 
 war {
-    archiveName 'esup-filemanager.war'
+    archiveFileName.set('esup-filemanager.war')
 }
diff --git a/overlays/jasig-widget-portlets/build.gradle b/overlays/jasig-widget-portlets/build.gradle
index 993dcecba5..d99b68790e 100644
--- a/overlays/jasig-widget-portlets/build.gradle
+++ b/overlays/jasig-widget-portlets/build.gradle
@@ -3,12 +3,11 @@ import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 apply plugin: GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portlet:jasig-widget-portlets:${jasigWidgetPortletVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portlet:jasig-widget-portlets:${jasigWidgetPortletVersion}@war"
 }
 
 war {
-    archiveName 'jasig-widget-portlets.war'
+    archiveFileName.set('jasig-widget-portlets.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are
diff --git a/overlays/pluto-testsuite/build.gradle b/overlays/pluto-testsuite/build.gradle
index 8222a9a515..11e5462c1c 100644
--- a/overlays/pluto-testsuite/build.gradle
+++ b/overlays/pluto-testsuite/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
-    runtime "org.apache.portals.pluto:pluto-testsuite:${plutoVersion}@war"
+    runtimeOnly "org.apache.portals.pluto:pluto-testsuite:${plutoVersion}@war"
 }
 
 war {
-    archiveName 'pluto-testsuite.war'
+    archiveFileName.set('pluto-testsuite.war')
 }
diff --git a/overlays/resource-server/build.gradle b/overlays/resource-server/build.gradle
index 64c93177f2..2a60424be9 100644
--- a/overlays/resource-server/build.gradle
+++ b/overlays/resource-server/build.gradle
@@ -8,24 +8,24 @@
  */
 
 dependencies {
-    runtime "org.jasig.resourceserver:resource-server-webapp:${resourceServerWebjarVersion}@war"
+    runtimeOnly "org.jasig.resourceserver:resource-server-webapp:${resourceServerWebjarVersion}@war"
 
-    runtime "org.webjars.npm:vue:${vueVersion}@jar"
+    runtimeOnly "org.webjars.npm:vue:${vueVersion}@jar"
 
     // uPortal Web Components Webjars
-    runtime "org.webjars.npm:uportal__api-template-vue:${uPortalWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__content-carousel:${uPortalWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__esco-content-menu:${uPortalWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__waffle-menu:${uPortalWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__api-template-vue:${uPortalWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__content-carousel:${uPortalWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__esco-content-menu:${uPortalWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__waffle-menu:${uPortalWebComponentsVersion}@jar"
 
     // Notification Webjars
-    runtime "org.webjars.npm:uportal__notification-banner:${notificationWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__notification-icon:${notificationWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__notification-list:${notificationWebComponentsVersion}@jar"
-    runtime "org.webjars.npm:uportal__notification-modal:${notificationWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__notification-banner:${notificationWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__notification-icon:${notificationWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__notification-list:${notificationWebComponentsVersion}@jar"
+    runtimeOnly "org.webjars.npm:uportal__notification-modal:${notificationWebComponentsVersion}@jar"
 
 }
 
 war {
-    archiveName 'resource-server.war'
+    archiveFileName.set('resource-server.war')
 }
diff --git a/overlays/uPortal/build.gradle b/overlays/uPortal/build.gradle
index 6f2b2230ea..3b0d8b4c63 100644
--- a/overlays/uPortal/build.gradle
+++ b/overlays/uPortal/build.gradle
@@ -2,8 +2,7 @@ import org.apereo.portal.start.gradle.plugins.GradleImportExportPlugin
 import org.apereo.portal.start.gradle.plugins.GradlePlutoPlugin
 
 dependencies {
-    runtime "org.jasig.portal:uPortal-webapp:${uPortalVersion}@war"
-    compile configurations.jdbc
+    runtimeOnly "org.jasig.portal:uPortal-webapp:${uPortalVersion}@war"
 }
 
 apply plugin: GradleImportExportPlugin
@@ -16,7 +15,7 @@ node {
 }
 
 war {
-    archiveName 'uPortal.war'
+    archiveFileName.set('uPortal.war')
     /*
      * For uPortal 5 (and beyond), the Community Best Practice for WAR files published to Maven
      * Central is that they should *not* contain JDBC driver jars;  all such WAR files are