Merge branch '7.0.x' of github.com:apereo/cas into 7.0.x

apereo · Oct 10, 2024 · 6fb5126 · 6fb5126
2 parents cd0d707 + 6255bf8
commit 6fb5126
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -347,7 +347,7 @@ jcifsVersion=1.3.17
 ###############################
 # Servlet container versions
 ###############################
-tomcatVersion=10.1.30
+tomcatVersion=10.1.31
 undertowVersion=2.3.16.Final
 jettyVersion=12.0.14
 ###############################

diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1567,15 +1567,6 @@ ext.libraries = [
                 dependencies.create("org.apache.logging.log4j:log4j-layout-template-json:$log4jVersion") {
                     exclude(group: "org.slf4j", module: "slf4j-api")
                 },
-                dependencies.create("org.apache.logging.log4j:log4j-spring-boot:$log4jVersion") {
-                    exclude(group: "org.slf4j", module: "slf4j-api")
-                    exclude(group: "org.apache.logging.log4j", module: "log4j-core")
-                    exclude(group: "org.apache.logging.log4j", module: "log4j-api")
-                    exclude(group: "commons-logging", module: "commons-logging")
-                    exclude(group: "org.springframework.boot", module: "spring-boot")
-                    exclude(group: "org.springframework", module: "spring-context-support")
-                    exclude(group: "org.springframework", module: "spring-context")
-                },
                 dependencies.create("com.lmax:disruptor:$disruptorVersion"),
                 dependencies.create("org.apache.logging.log4j:log4j-spring-cloud-config-client:$log4jVersion") {
                     exclude(group: "org.slf4j", module: "slf4j-api")

diff --git a/...-api/src/main/java/org/apereo/cas/support/saml/OpenSamlConfigurationPropertiesSource.java b/...-api/src/main/java/org/apereo/cas/support/saml/OpenSamlConfigurationPropertiesSource.java
@@ -28,6 +28,12 @@ public class OpenSamlConfigurationPropertiesSource implements ConfigurationPrope
      */
     public static final String CONFIG_APACHE_XML_IGNORE_LINEBREAKS = "org.apache.xml.security.ignoreLineBreaks";
 
+    static {
+        System.setProperty(CONFIG_STRICT_MODE, "true");
+        System.setProperty(CONFIG_SUN_XML_IGNORE_LINEBREAKS, "true");
+        System.setProperty(CONFIG_APACHE_XML_IGNORE_LINEBREAKS, "true");
+    }
+
     @Override
     public ConfigurationProperties getProperties() {
         val properties = new Properties();