Merge pull request #530 from bjagg/chore/gradle.properties-comments

chore: comment and organize gradle.properties

gradle.properties

@@ -1,21 +1,24 @@
 version=5.0.0-SNAPSHOT
 
-# Versions of Bundled Applications
+# Versions of Bundled Applications under `overlays/`
 announcementsPortletVersion=2.4.6
 basicltiPortletVersion=1.4.2
 bookmarksPortletVersion=1.2.4
 calendarPortletVersion=2.6.2
+# Do not upgrade bundled CAS -- Quickstart Customizations
 casServerVersion=3.6.0
 casProxyTestPortletVersion=1.0.2
 emailPreviewPortletVersion=2.3.0
 esupFilemanagerPortletVersion=4.0.0
 feedbackPortletVersion=1.2.2
 functionalTestsPortletVersion=1.1.4
 jasigWidgetPortletVersion=2.3.1
-resourceServerVersion=1.0.48
-resourceServer13Version=1.3.1
 newsReaderPortletVersion=5.0.4
 notificationPortletVersion=4.6.1
+# Required for very old front-end dependencies
+resourceServerVersion=1.0.48
+# Includes newer front-end dependencies and web components
+resourceServer13Version=1.3.1
 sakaiConnectorPortletVersion=1.5.2
 simpleContentPortletVersion=3.3.1
 uPortalVersion=5.11.0
@@ -27,25 +30,35 @@ vueVersion=2.6.14
 uPortalWebComponentsVersion=1.37.0
 notificationWebComponentsVersion=1.0.4
 
-portletApiDependency=org.apache.portals:portlet-api_2.1.0_spec:1.0
+# Dependencies driven by Tomcat version
+tomcatVersion=8.5.51
 servletApiDependency=javax.servlet:javax.servlet-api:3.0.1
-
 ccppVersion=1.0
-commonsCodecVersion=1.15
-commonsCollectionsVersion=3.2.2
-commonsDbcpVersion=1.4
-ehcacheVersion=2.6.11
+personDirectoryVersion=1.8.14
+
+# Dependencies driven by Pluto Portlet Engine version
+plutoVersion=2.1.0-M3
+portletApiDependency=org.apache.portals:portlet-api_2.1.0_spec:1.0
+
+# Gradle Task Dependencies
 gradleDockerPluginVersion=3.2.4
 hsqldbVersion=2.5.1
 jasyptVersion=1.9.3
-personDirectoryVersion=1.8.14
-plutoVersion=2.1.0-M3
-slf4jVersion=1.7.30
-springVersion=3.2.18.RELEASE
-tomcatVersion=8.5.51
-waroverlayPluginVersion=0.9.3
-xercesImplVersion=2.12.1
 nodejsVersion=12.16.1
+waroverlayPluginVersion=0.9.3
+
+# Dependencies used by overlays/ projects and custom code
+# N.B. should be prefixed with an abbreviation if not for all projects (unlikely)
+
+# CAS
+casCommonsCodecVersion=1.15
+casCommonsCollectionsVersion=3.2.2
+casCommonsDbcpVersion=1.4
+casEhcacheVersion=2.6.11
+casSlf4jVersion=1.7.30
+casSpringVersion=3.2.18.RELEASE
+casXercesImplVersion=2.12.1
+
 
 org.gradle.parallel=true
 

gradle/tasks/perf.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.jasypt:jasypt:1.9.3"
+        classpath "org.jasypt:jasypt:${jasyptVersion}"
     }
 }
 

overlays/cas/build.gradle

@@ -1,29 +1,29 @@
 apply plugin: 'java'
 
 dependencies {
-    runtime("commons-dbcp:commons-dbcp:${commonsDbcpVersion}") {
+    runtime("commons-dbcp:commons-dbcp:${casCommonsDbcpVersion}") {
         exclude group: 'xml-apis', module: 'xml-apis'
         exclude group: 'xerces', module: 'xercesImpl'
     }
-    runtime "net.sf.ehcache:ehcache-core:${ehcacheVersion}"
+    runtime "net.sf.ehcache:ehcache-core:${casEhcacheVersion}"
     runtime "org.jasig.cas:cas-server-webapp:${casServerVersion}@war"
     runtime("org.jasig.cas:cas-server-extension-clearpass:${casServerVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'javax.xml', module: 'xmldsig'
     }
-    runtime "xerces:xercesImpl:${xercesImplVersion}"
+    runtime "xerces:xercesImpl:${casXercesImplVersion}"
 
-    compile "commons-codec:commons-codec:${commonsCodecVersion}"
-    compile "commons-collections:commons-collections:${commonsCollectionsVersion}"
+    compile "commons-codec:commons-codec:${casCommonsCodecVersion}"
+    compile "commons-collections:commons-collections:${casCommonsCollectionsVersion}"
     compile "org.jasypt:jasypt:${jasyptVersion}"
-    compile "org.slf4j:slf4j-api:${slf4jVersion}"
+    compile "org.slf4j:slf4j-api:${casSlf4jVersion}"
     compile configurations.jdbc
 
     compileOnly("org.jasig.cas:cas-server-core:${casServerVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'javax.xml', module: 'xmldsig'
     }
-    compileOnly("org.springframework:spring-jdbc:${springVersion}") {
+    compileOnly("org.springframework:spring-jdbc:${casSpringVersion}") {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     compileOnly servletApiDependency
@@ -34,7 +34,7 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
         exclude group: 'javax.xml', module: 'xmldsig'
     }
-    testCompile group: 'org.springframework', name: 'spring-jdbc', version: springVersion
+    testCompile group: 'org.springframework', name: 'spring-jdbc', version: "${casSpringVersion}"
 }
 
 war {