Merge branch '6.1' into 6.2

# Conflicts: # loader/build.xml # loader/pom.xml
lucee · Dec 13, 2024 · 4b37063 · 4b37063
2 parents 45b8f8a + bc9b512
commit 4b37063
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java b/core/src/main/java/lucee/runtime/config/ConfigWebFactory.java
@@ -3664,10 +3664,15 @@ private static void _loadSetting(ConfigServerImpl configServer, ConfigImpl confi
 			str = SystemUtil.getSystemPropOrEnvVar("lucee.cfml.writer", null);
 			if (StringUtil.isEmpty(str)) {
 				str = getAttr(root, "cfmlWriter");
+
+				// CB compatibility
+				if (StringUtil.isEmpty(str, true)) str = getAttr(root, "whitespaceManagement");
 			}
 			if (!StringUtil.isEmpty(str) && hasAccess) {
 				if ("white-space".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS);
+				else if ("simple".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS);
 				else if ("white-space-pref".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS_PREF);
+				else if ("smart".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_WS_PREF);
 				else if ("regular".equalsIgnoreCase(str)) config.setCFMLWriterType(ConfigPro.CFML_WRITER_REFULAR);
 				// FUTURE add support for classes implementing CFMLWriter interface
 			}

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.208-SNAPSHOT"/>
+  <property name="version" value="6.2.0.209-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.208-SNAPSHOT</version>
+  <version>6.2.0.209-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>