Merge branch 'development'

Ortus-Solutions · May 3, 2022 · ba7c150 · ba7c150
2 parents 3302bdd + 138619f
commit ba7c150
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/build/build.properties b/build/build.properties
@@ -12,7 +12,7 @@ java.debug=true
 dependencies.dir=${basedir}/lib
 cfml.version=5.3.9.133-SNAPSHOT
 cfml.extensions=8D7FB0DF-08BB-1589-FE3975678F07DB17
-cfml.loader.version=2.6.16
+cfml.loader.version=2.6.17
 cfml.cli.version=${cfml.loader.version}.${cfml.version}
 lucee.version=${cfml.version}
 # Don't bump this version.  Need to remove this dependency from cfmlprojects.org

diff --git a/build/build.xml b/build/build.xml
@@ -16,8 +16,8 @@ External Dependencies:
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
  	<!-- Special things happen when the version and stableVersion are the same value as that signifies a "stable" build.   -->
- 	<property name="commandbox.version"			value="5.5.0"/>
- 	<property name="commandbox.stableVersion"	value="5.5.0"/>
+ 	<property name="commandbox.version"			value="5.5.1"/>
+ 	<property name="commandbox.stableVersion"	value="5.5.1"/>
 
     <!-- Time Label -->
 	<tstamp prefix="start"/>

diff --git a/src/cfml/system/config/box.schema.json b/src/cfml/system/config/box.schema.json
@@ -210,7 +210,10 @@
 		"keywords": {
 			"title": "Keywords",
 			"description": "ForgeBox keywords",
-			"type": "array",
+			"type": [
+				"array",
+				"string"
+			],
 			"items": {
 				"title": "Keyword",
 				"description": "ForgeBox keyword",

diff --git a/src/java/cliloader/LoaderCLIMain.java b/src/java/cliloader/LoaderCLIMain.java
@@ -713,6 +713,8 @@ public static ArrayList< String > initialize( String[] arguments ) throws IOExce
 		File libDir = getLibDir();
 		// Default Log4j2 config is in the libn folder
 		System.setProperty("log4j2.configurationFile", new File( libDir, "log4j2.xml" ).toURI().toString() );
+		// The OSGI bundle loader is throwing an error so we need to force the default CL context selector
+		System.setProperty("Log4jContextSelector", "org.apache.logging.log4j.core.selector.ClassLoaderContextSelector" );
 		props.setProperty( "cfml.cli.lib", libDir.getAbsolutePath() );
 		File cfmlDir = new File( cli_home.getPath() + "/cfml" );
 		File cfmlSystemDir = new File( cli_home.getPath() + "/cfml/system" );