Merge tag '21.3.1' into develop

Upgrade logger for CAS 6.2.x

Author: cslzchen

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+21.3.1 (12-14-2021)
+===================
+
+Upgrade logger for CAS 6.2.x
+
 21.3.0 (07-19-2021)
 ===================
 

build.gradle

@@ -160,6 +160,26 @@ dependencies {
     implementation "org.jasig.cas.client:cas-client-core:${casClientVersion}"
     // The SAML module supports SAML validation for CAS-PAC4J institution SSO
     implementation "org.jasig.cas.client:cas-client-support-saml:${casClientVersion}"
+
+    // Log4j
+    implementation("org.apache.logging.log4j:log4j-api:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
+    implementation("org.apache.logging.log4j:log4j-core:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
+    implementation("org.apache.logging.log4j:log4j-jcl:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
+    implementation("org.apache.logging.log4j:log4j-jul:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
+    implementation("org.apache.logging.log4j:log4j-web:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
+    implementation("org.apache.logging.log4j:log4j-slf4j18-impl:$log4jVersion") {
+        exclude(group: "org.slf4j", module: "slf4j-api")
+    }
 }
 
 tasks.findByName("jibDockerBuild")

gradle.properties

@@ -33,3 +33,4 @@ gsonVersion=2.8.6
 hibernateCoreVersion=5.4.21.Final
 nimbusJoseVersion=8.20.1
 springBootTomcatVersion=9.0.37
+log4jVersion=2.15.0

gradle/springboot.gradle

@@ -94,7 +94,14 @@ bootWar {
             // skip = false     // the same as enabled = true
             provided = false
             enableCompilation = true
-            // excludes = []
+            excludes = [
+                    "WEB-INF/lib/log4j-api-2.13.3.jar",
+                    "WEB-INF/lib/log4j-core-2.13.3.jar",
+                    "WEB-INF/lib/log4j-jcl-2.13.3.jar",
+                    "WEB-INF/lib/log4j-jul-2.12.1.jar",
+                    "WEB-INF/lib/log4j-slf4j18-impl-2.13.3.jar",
+                    "WEB-INF/lib/log4j-web-2.13.3.jar"
+            ]
             // includes = []
             // targetPath = ""  //  the content of the overlay is added in the root structure of the webapp by default
         }