Ortus-Solutions
diff --git a/‎.cfmigrations.json‎
Lines changed: 4 additions & 2 deletions b/‎.cfmigrations.json‎
Lines changed: 4 additions & 2 deletions
diff --git a/‎.env.template‎
Lines changed: 4 additions & 0 deletions b/‎.env.template‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎.github/workflows/release.yml‎
Lines changed: 5 additions & 6 deletions b/‎.github/workflows/release.yml‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎.github/workflows/snapshot.yml‎
Lines changed: 6 additions & 0 deletions b/‎.github/workflows/snapshot.yml‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎.github/workflows/tests.yml‎
Lines changed: 19 additions & 19 deletions b/‎.github/workflows/tests.yml‎
Lines changed: 19 additions & 19 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 1 deletion b/‎.gitignore‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎box-site.json‎
Lines changed: 1 addition & 2 deletions b/‎box-site.json‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎box.json‎
Lines changed: 8 additions & 16 deletions b/‎box.json‎
Lines changed: 8 additions & 16 deletions
diff --git a/‎build/resources/server.json‎
Lines changed: 2 additions & 2 deletions b/‎build/resources/server.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎config/modules/htmlhelper.cfc‎ ‎config/modules/HTMLHelper.cfc‎config/modules/htmlhelper.cfc renamed to config/modules/HTMLHelper.cfc b/‎config/modules/htmlhelper.cfc‎ ‎config/modules/HTMLHelper.cfc‎config/modules/htmlhelper.cfc renamed to config/modules/HTMLHelper.cfc
@@ -5,13 +5,14 @@
 		"seedsDirectory": "tests/resources/seeds/",
         "properties": {
             "defaultGrammar": "AutoDiscover@qb",
-			"schema" : "${DB_DATABASE}",
+			"schema" : "${DB_SCHEMA}",
             "migrationsTable": "cfmigrations",
             "connectionInfo": {
 				"connectionString": "${DB_CONNECTIONSTRING}",
                 "class": "${DB_CLASS}",
                 "username": "${DB_USER}",
                 "password": "${DB_PASSWORD}",
+				"database" : "${DB_DATABASE}",
                 "bundleName": "${DB_BUNDLENAME}",
                 "bundleVersion": "${DB_BUNDLEVERSION}"
             }
@@ -23,13 +24,14 @@
 		"seedsDirectory": "resources/database/seeds/",
         "properties": {
             "defaultGrammar": "AutoDiscover@qb",
-			"schema" : "${DB_DATABASE}",
+			"schema" : "${DB_SCHEMA}",
             "migrationsTable": "cfmigrations_app",
             "connectionInfo": {
 				"connectionString": "${DB_CONNECTIONSTRING}",
                 "class": "${DB_CLASS}",
                 "username": "${DB_USER}",
                 "password": "${DB_PASSWORD}",
+				"database" : "${DB_DATABASE}",
                 "bundleName": "${DB_BUNDLENAME}",
                 "bundleVersion": "${DB_BUNDLEVERSION}"
             }
 
@@ -63,6 +63,7 @@ DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_CONNECTIONSTRING=jdbc:mysql://127.0.0.1:3306/contentbox?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=true
 # DB Credentials
+DB_SCHEMA=
 DB_DATABASE=contentbox
 DB_USER=root
 DB_PASSWORD=mysql
@@ -79,6 +80,7 @@ DB_PASSWORD=mysql
 #DB_PORT=4306
 #DB_CONNECTIONSTRING=jdbc:mysql://127.0.0.1:4306/contentbox?allowPublicKeyRetrieval=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=true
 ## DB Credentials
+#DB_SCHEMA=
 #DB_DATABASE=contentbox
 #DB_USER=root
 #DB_PASSWORD=contentbox
@@ -95,6 +97,7 @@ DB_PASSWORD=mysql
 #DB_PORT=5432
 #DB_CONNECTIONSTRING=jdbc:postgresql://localhost:5432/contentbox
 ## DB Credentials
+#DB_SCHEMA=public
 #DB_DATABASE=contentbox
 #DB_USER=contentbox
 #DB_PASSWORD=contentbox
@@ -111,6 +114,7 @@ DB_PASSWORD=mysql
 #DB_PORT=1433
 #DB_CONNECTIONSTRING=jdbc:sqlserver://localhost:1433;DATABASENAME=contentbox;sendStringParametersAsUnicode=true;SelectMethod=direct
 ## DB Credentials
+#DB_SCHEMA=
 #DB_DATABASE=contentbox
 #DB_USER=sa
 #DB_PASSWORD=ContentB0x!
 
@@ -37,7 +37,7 @@ jobs:
   #############################################
   build:
     name: Build & Publish Release
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "11"
+          java-version: "21"
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/setup-commandbox@v2.0.1
@@ -59,7 +59,6 @@ jobs:
           box install commandbox-docbox
           cd modules/contentbox && box install --production
 
-      # Focal ships with node 16.x so we need to update to 18
       - name:  Install Node 18
         uses: actions/setup-node@v4
         with:
@@ -115,10 +114,10 @@ jobs:
       - name: Build API Docs
         run: |
           # Normalize swagger doc results if they exist
-          if test -f tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json; then
-            cp -v tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json tests/results/
+          if test -f tests/results/contentbox-test-results-lucee@5-coldbox^7-experimental-false/contentbox-swagger.json; then
+            cp -v tests/results/contentbox-test-results-lucee@5-coldbox^7-experimental-false/contentbox-swagger.json tests/results/
           else
-            echo "File tests/results/contentbox-test-results-lucee@5-jdk11-coldbox^7-experimental-false/contentbox-swagger.json does not exist"
+            echo "File tests/results/contentbox-test-results-lucee@5-coldbox^7-experimental-false/contentbox-swagger.json does not exist"
           fi
           # Run Docs Build
           box run-script build:allDocs
 
@@ -4,6 +4,12 @@ on:
   push:
     branches:
       - development
+  workflow_dispatch:
+
+# Unique group name per workflow-branch/tag combo
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   #############################################
 
@@ -18,33 +18,33 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
+        cfengine: [ "lucee@5", "adobe@2021", "adobe@2023" ]
         coldboxVersion: [ "^7" ]
-        jdkVersion: [ "11" ]
+        jdkVersion: [ "21" ]
         experimental: [ false ]
         include:
-          # Engines BE
-          - cfengine: "lucee@be"
-            coldboxVersion: "^7"
-            jdkVersion: "17"
-            experimental: true
+          # Lucee 6 has a regression
           - cfengine: "lucee@6"
             coldboxVersion: "^7"
-            jdkVersion: "17"
+            jdkVersion: "21"
             experimental: true
+          # - cfengine: "adobe@2025"
+          #   coldboxVersion: "^7"
+          #   jdkVersion: "21"
+          #   experimental: true
           # ColdBox BE on all allowed distros
           # This makes sure we don't have any issues with the BE of ColdBox
           - cfengine: "lucee@5"
             coldboxVersion: "be"
-            jdkVersion: "11"
+            jdkVersion: "21"
             experimental: true
-          - cfengine: "adobe@2021"
+          - cfengine: "lucee@6"
             coldboxVersion: "be"
-            jdkVersion: "11"
+            jdkVersion: "21"
             experimental: true
           - cfengine: "adobe@2023"
             coldboxVersion: "be"
-            jdkVersion: "17"
+            jdkVersion: "21"
             experimental: true
 
     steps:
@@ -81,15 +81,15 @@ jobs:
           printf "DB_CONNECTIONSTRING=jdbc:mysql://127.0.0.1:3306/contentbox?useSSL=false&useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC&useLegacyDatetimeCode=true\n" >> .env
 
       - name: Add Hibernate Logging
-        if: "${{ matrix.cfengine != 'lucee@5' }}"
+        if: contains( matrix.cfengine, 'adobe' )
         run: |
           # Log4j Hibernate Debug
-          mkdir -p .engines/acf2018/WEB-INF/cfusion/lib/
           mkdir -p .engines/acf2021/WEB-INF/cfusion/lib/
           mkdir -p .engines/acf2023/WEB-INF/cfusion/lib/
-          cp build/resources/log4j.properties .engines/acf2018/WEB-INF/cfusion/lib/
+          mkdir -p .engines/acf2025/WEB-INF/cfusion/lib/
           cp build/resources/log4j.properties .engines/acf2021/WEB-INF/cfusion/lib/
           cp build/resources/log4j.properties .engines/acf2023/WEB-INF/cfusion/lib/
+          cp build/resources/log4j.properties .engines/acf2025/WEB-INF/cfusion/lib/
 
       - name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
         run: |
@@ -123,7 +123,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v4
         with:
-          name: contentbox-test-results-${{ matrix.cfengine }}-jdk${{ matrix.jdkVersion }}-coldbox${{ matrix.coldboxVersion }}-experimental-${{ matrix.experimental }}
+          name: contentbox-test-results-${{ matrix.cfengine }}-coldbox${{ matrix.coldboxVersion }}-experimental-${{ matrix.experimental }}
           path: |
             tests/results/**/*
 
@@ -142,15 +142,15 @@ jobs:
       - name: Failure Debugging Info
         if: ${{ failure() }}
         run: |
-          if [[ "{{ matrix.cfengine }}" == "adobe@2018" ]] ; then
-            cat .engines/acf2018/WEB-INF/cfusion/logs/hibernatesql.log
-          fi
           if [[ "{{ matrix.cfengine }}" == "adobe@2021" ]] ; then
             cat .engines/acf2021/WEB-INF/cfusion/logs/hibernatesql.log
           fi
           if [[ "{{ matrix.cfengine }}" == "adobe@2023" ]] ; then
             cat .engines/acf2023/WEB-INF/cfusion/logs/hibernatesql.log
           fi
+          if [[ "{{ matrix.cfengine }}" == "adobe@2025" ]] ; then
+            cat .engines/acf2025/WEB-INF/cfusion/logs/hibernatesql.log
+          fi
           box server info serverConfigFile="server-${{ matrix.cfengine }}.json" --json
           box server log serverConfigFile="server-${{ matrix.cfengine }}.json"
 
 
@@ -23,7 +23,7 @@ build/dependencies
 config/logs/**
 
 # Engines + Docker Libraries
-.engines
+.engines/**
 bin/.db/**
 tests/resources/dbs/.db/**
 
 
@@ -29,8 +29,7 @@
     "dependencies":{
         "coldbox":"^7.0.0+7",
 		"contentbox":"~@version.number@+@build.number@",
-		"commandbox-dotenv":"*",
-		"commandbox-cfconfig":"*",
+		"commandbox-boxlang":"*",
 		"commandbox-migrations":"*"
 	},
 	"devDependencies":{
 
@@ -1,6 +1,6 @@
 {
     "name":"ContentBox Tester Site",
-    "version":"6.0.5",
+    "version":"6.1.0",
     "author":"Ortus Solutions <info@ortussolutions.com>",
     "shortDescription":"A tester site for developing the ContentBox Modular CMS",
     "type":"cms",
@@ -24,17 +24,17 @@
         "Curt Gratz <gratz@computerknowhow.com>"
     ],
     "dependencies":{
-        "coldbox":"^7.0.0",
-        "commandbox-dotenv":"*",
-        "commandbox-cfconfig":"*",
-        "commandbox-migrations":"^4.0.0"
+        "coldbox":"be",
+        "commandbox-migrations":"^5.0.0"
     },
     "devDependencies":{
         "testbox":"^5.0.0+1",
+        "commandbox-boxlang":"*",
         "commandbox-cfformat":"*",
+        "commandbox-cfconfig":"*",
         "commandbox-docbox":"*",
-        "cbdebugger":"be",
-        "route-visualizer":"^2.0.0+6"
+        "cbdebugger":"*",
+        "route-visualizer":"*"
     },
     "installPaths":{
         "testbox":"testbox/",
@@ -54,15 +54,7 @@
         "format":"cfformat run config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc --overwrite",
         "format:watch":"cfformat watch config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
         "format:watch:core":"cfformat watch config/**/*.cfc,modules/contentbox/models/**/*.cfc,Application.cfc ./.cfformat.json",
-        "format:check":"cfformat check config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc",
-        "start:lucee":"server start serverConfigFile='server-lucee@5.json' --force",
-        "start:2018":"server start serverConfigFile='server-adobe@2018.json' --force",
-        "start:2021":"server start serverConfigFile='server-adobe@2021.json' --force",
-        "start:2023":"server start serverConfigFile='server-adobe@2023.json' --force",
-        "log:lucee":"server log serverConfigFile=server-lucee@5.json --follow",
-        "log:2018":"server log serverConfigFile=server-adobe@2018.json --follow",
-        "log:2021":"server log serverConfigFile=server-adobe@2021.json --follow",
-        "log:2023":"server log serverConfigFile=server-adobe@2023.json --follow",
+        "format:check":"cfformat check config/**/*.cfc,modules_app/**/*.cfc,modules/contentbox/**/*.cfc,tests/**/*.cfc,Application.cfc ./.cfformat.json",
         "contentbox:install":"install --force && cd modules/contentbox && install --force",
         "contentbox:migrate:create":"migrate create name=${1} manager=contentbox",
         "contentbox:migrate":"migrate up manager=contentbox",
 
@@ -8,7 +8,7 @@
     },
     "JVM": {
         "heapSize": "768",
-		"args": "-Dfile.encoding=UTF8 -Dcom.sun.net.ssl.enableECC=false"
+		"args": "-Dcom.sun.net.ssl.enableECC=false"
 	},
 	"openBrowserURL" : "/",
     "trayicon":"modules_app/contentbox-custom/_content/ContentBoxIcon300.png",
@@ -23,6 +23,6 @@
         "file":".cfconfig.json"
     },
 	"env":{
-        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B;version=6.4.0"
+        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
     }
 }