uPortal-Project · ChristianMurphy · Feb 16, 2026
diff --git 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
@@ -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
@@ -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
diff --git 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
diff --git a/gradlew.bat b/gradlew.bat
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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')
 }