Merge branch 'Ortus-Solutions:development' into development

Author: gavinbaumanis

.github/workflows/lts.yml

@@ -18,7 +18,7 @@ jobs:
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/pr.yml

@@ -19,7 +19,7 @@ jobs:
 
   format_check:
     name: Checks Source Code Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4

.github/workflows/release.yml

@@ -222,7 +222,7 @@ jobs:
   prep_next_release:
     name: Prep Next Release
     if: github.ref != 'refs/heads/development'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: [ build ]
     steps:
       - name: Checkout Development Repository

.github/workflows/snapshot.yml

@@ -24,7 +24,7 @@ jobs:
   ##########################################################################################
   format:
     name: Code Auto-Formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   tests:
     name: Test Suites
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       DB_USER: root
       DB_PASSWORD: root
@@ -24,6 +24,15 @@ jobs:
         experimental: [ false ]
         include:
           # Lucee 6 has a regression
+          - cfengine: "boxlang@1"
+            coldboxVersion: "^7"
+            jdkVersion: "21"
+            experimental: true
+          - cfengine: "boxlang@1"
+            coldboxVersion: "be"
+            jdkVersion: "21"
+            experimental: true
+          # Lucee 6 has a regression
           - cfengine: "lucee@6"
             coldboxVersion: "^7"
             jdkVersion: "21"

box.json

@@ -25,14 +25,13 @@
     ],
     "dependencies":{
         "coldbox":"be",
-        "commandbox-migrations":"^5.0.0"
+        "commandbox-migrations":"*"
     },
     "devDependencies":{
-        "testbox":"^5.0.0+1",
-        "commandbox-boxlang":"*",
+		"commandbox-boxlang":"*",
         "commandbox-cfformat":"*",
-        "commandbox-cfconfig":"*",
         "commandbox-docbox":"*",
+        "testbox":"*",
         "cbdebugger":"*",
         "route-visualizer":"*"
     },

modules/contentbox/models/content/BaseContent.cfc

@@ -161,7 +161,6 @@ component
 		column ="expireDate"
 		notnull="false"
 		ormtype="timestamp"
-		default=""
 		index  ="idx_expireDate";
 
 	property

modules/contentbox/models/content/EntryService.cfc

@@ -169,13 +169,13 @@ component extends="ContentService" singleton {
 		// we use HQL so we can be DB independent using the map() hql function thanks to John Wish, you rock!
 		var hql = "SELECT new map( count(*) as count, YEAR(publishedDate) as year, MONTH(publishedDate) as month )
 				   FROM cbEntry
-				  WHERE isPublished = true
+				  WHERE isPublished = :isPublished
 				    AND passwordProtection = ''
 				    AND publishedDate <= :now
 				  GROUP BY YEAR(publishedDate), MONTH(publishedDate)
 				  ORDER BY 2 DESC, 3 DESC";
 		// run report
-		return executeQuery( query = hql, params = { "now" : now() } );
+		return executeQuery( query = hql, params = { "isPublished" : true, "now" : now() } );
 	}
 
 	/**
@@ -202,10 +202,10 @@ component extends="ContentService" singleton {
 	){
 		var results = {};
 		var hql     = "FROM cbEntry
-				  WHERE isPublished = true
+				  WHERE isPublished = :isPublished
 				    AND passwordProtection = ''
 				    AND publishedDate <= :now";
-		var params      = {};
+		var params      = { "isPublished" : true };
 		params[ "now" ] = now();
 
 		// Site

modules/contentbox/modules/contentbox-admin/views/settings/index.cfm

@@ -42,7 +42,7 @@
                             </li>
                             <li class="nav-item">
 								<a href="##login_options" data-toggle="tab" class="nav-link">
-									<i class="fa fa-sign-in fa-lg"></i> Login
+									<i class="fa fa-sign-in-alt fa-lg"></i> Login
 								</a>
                             </li>
                             <li class="nav-item">

[email protected]

@@ -1,11 +1,11 @@
 {
     "app":{
-		"cfengine":"boxlang@be",
-        "serverHomeDirectory":".engine/boxlang"
+        "cfengine":"boxlang@be",
+        "serverHomeDirectory":".engines/boxlang"
     },
     "name":"contentbox-boxlang",
     "JVM":{
-		"javaVersion":"openjdk21_jre",
+        "javaVersion":"openjdk21_jre",
         "heapSize":"1024",
         "args":"-Dcom.sun.net.ssl.enableECC=false -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
     },
@@ -31,7 +31,7 @@
     "cfconfig":{
         "file":".cfconfig.json"
     },
-	"env":{
+    "env":{
         "BOXLANG_DEBUG":true
     },
     "scripts":{