From 8c0464df183ddf552fb9eae4eacbcb14c5c2dbb6 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Fri, 29 Apr 2022 00:08:19 -0500
Subject: [PATCH 1/5] bump new BE version

---
 build/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.xml b/build/build.xml
index bdc0d7cd..9d5ed8ed 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -16,7 +16,7 @@ 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.version"			value="5.6.0-alpha"/>
  	<property name="commandbox.stableVersion"	value="5.5.0"/>
 
     <!-- Time Label -->

From 4e391f750030738b31a2812b158a3520bc2a04cd Mon Sep 17 00:00:00 2001
From: KamasamaK <KamasamaK@users.noreply.github.com>
Date: Sat, 30 Apr 2022 15:02:45 -0400
Subject: [PATCH 2/5] Add string type to keywords in box schema (#309)

---
 src/cfml/system/config/box.schema.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/cfml/system/config/box.schema.json b/src/cfml/system/config/box.schema.json
index 7eeddfef..715755a1 100644
--- 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",

From 641b9dcd72a5fcead241a33fc5f9963e352501c9 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Mon, 2 May 2022 20:21:20 -0500
Subject: [PATCH 3/5] COMMANDBOX-1460

---
 src/java/cliloader/LoaderCLIMain.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/java/cliloader/LoaderCLIMain.java b/src/java/cliloader/LoaderCLIMain.java
index 3e595678..a530d1d5 100644
--- 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" );

From cfeae157e2d556ad540f4e8b8770664df7d7af6d Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Mon, 2 May 2022 20:22:52 -0500
Subject: [PATCH 4/5] Bump for 5.5.1

---
 build/build.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 9d5ed8ed..b80c36ef 100644
--- 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.6.0-alpha"/>
- 	<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"/>

From 138619f044252351666526e4017e15ddc0d95b86 Mon Sep 17 00:00:00 2001
From: Brad Wood <brad@bradwood.com>
Date: Mon, 2 May 2022 20:31:53 -0500
Subject: [PATCH 5/5] Bump loader version

---
 build/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/build.properties b/build/build.properties
index 299b4719..cc7f5c83 100644
--- 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