Merge branch 'development'

Author: lmajano

.github/workflows/lts.yml

@@ -20,7 +20,7 @@ jobs:
     name: Code Auto-Formatting
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Auto-format
         uses: Ortus-Solutions/[email protected]

.github/workflows/pr.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4.2.0
 
       - uses: Ortus-Solutions/[email protected]
         with:

.github/workflows/release.yml

@@ -40,10 +40,10 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: "11"
@@ -88,7 +88,7 @@ jobs:
           box task run build/Build.cfc run ${{ env.COLDBOX_VERSION }} ${{ github.run_number }} ${{ env.BRANCH }}
 
       - name: Commit Changelog [unreleased] with latest version
-        uses: EndBug/[email protected].1
+        uses: EndBug/[email protected].4
         if: env.SNAPSHOT == 'false'
         with:
           author_name: Github Actions
@@ -97,7 +97,7 @@ jobs:
           add: changelog.md
 
       - name: Tag Version
-        uses: rickstaa/action-create-tag@v1.6.1
+        uses: rickstaa/action-create-tag@v1.7.2
         if: env.SNAPSHOT == 'false'
         with:
           tag: "v${{ env.COLDBOX_VERSION }}"
@@ -106,9 +106,8 @@ jobs:
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: coldbox-variants
           path: |
             .artifacts/**/*
             changelog.md
@@ -144,7 +143,7 @@ jobs:
           cd $ROOT_DIR/.artifacts/logbox/${{ env.COLDBOX_VERSION }} && box forgebox publish
 
       - name: Create Github Release
-        uses: taiki-e/create-gh-release-action@v1.6.2
+        uses: taiki-e/create-gh-release-action@v1.8.0
         continue-on-error: true
         if: env.SNAPSHOT == 'false'
         with:
@@ -175,13 +174,13 @@ jobs:
     needs: [ build ]
     steps:
       - name: Checkout Development Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: env.LTS == 'false'
         with:
           ref: development
 
       - name: Checkout LTS Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         if: env.LTS == 'true'
 
       - name: Setup CommandBox
@@ -190,9 +189,8 @@ jobs:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
-          name: coldbox-variants
           path: .tmp
 
       - name: Copy Changelog
@@ -210,7 +208,7 @@ jobs:
           git pull
 
       - name: Commit Version Bump
-        uses: EndBug/[email protected].1
+        uses: EndBug/[email protected].4
         with:
           author_name: Github Actions
           author_email: [email protected]

.github/workflows/snapshot.yml

@@ -7,6 +7,11 @@ on:
     branches:
       - development
 
+# Unique group name per workflow-branch/tag combo
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   #############################################
   # Tests First baby! We fail, no build :(
@@ -22,7 +27,7 @@ jobs:
     name: Code Auto-Formatting
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Auto-format
         uses: Ortus-Solutions/[email protected]

.github/workflows/tests.yml

@@ -19,26 +19,22 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        commandbox_version: [ "5.9.0" ]
+        commandbox_version: [ "6.0.1" ]
         cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
         jdkVersion: [ "11" ]
         experimental: [false]
         include:
           - cfengine: "lucee@6"
-            commandbox_version: "6.0.0-alpha"
-            jdkVersion: "11"
-            experimental: true
-          - cfengine: "lucee@6"
-            commandbox_version: "6.0.0-alpha"
             jdkVersion: "17"
+            commandbox_version: "6.0.1"
             experimental: true
           - cfengine: "adobe@2023"
-            commandbox_version: "5.9.0"
             jdkVersion: "17"
+            commandbox_version: "6.0.1"
             experimental: false
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Database and Fixtures
         run: |
@@ -47,7 +43,7 @@ jobs:
           mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < tests/resources/coolblog.sql
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: "temurin"
           java-version: ${{ matrix.jdkVersion }}
@@ -87,18 +83,11 @@ jobs:
       - name: Set cfengine version env
         run: echo "CFENGINE_VERSION=$(box echo ${serverInfo.engineName@coldbox-${{ matrix.cfengine }}}@${serverInfo.engineVersion@coldbox-${{ matrix.cfengine }}})" >> $GITHUB_ENV
 
-      - name: Publish Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v2
-        if: always()
-        with:
-          files: tests/results/**/*.xml
-          check_name: "${{ env.CFENGINE_VERSION }} Test Results"
-
       - name: Upload Test Results Artifacts
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: coldbox-test-results-${{ matrix.cfengine }}
+          name: Test Results Engine ${{ matrix.cfengine }} JDK ${{ matrix.jdkVersion }}
           path: |
             tests/results/**/*
 
@@ -115,7 +104,7 @@ jobs:
           SLACK_USERNAME: CI
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
 
-      - name: Failure Debugging Info
+      - name: Output Failure Debugging Info
         if: ${{ failure() }}
         run: |
           box version
@@ -124,9 +113,26 @@ jobs:
 
       - name: Upload Debugging Info To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: Failure Debugging Info - ${{ matrix.cfengine }}
+          name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.jdkVersion }}
           path: |
             .engine/**/logs/*
             .engine/**/WEB-INF/cfusion/logs/*
+
+  # Publish the test results
+  publish-test-results:
+    name: Publish Test Results
+    needs: tests
+    runs-on: ubuntu-latest
+    if: always()
+    steps:
+      - name: Download Test Results Artifacts
+        uses: actions/download-artifact@v4
+        with:
+          path: artifacts
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: artifacts/**/*.xml

apidocs/cachebox.cfm

@@ -4,6 +4,11 @@
 	docName = "CacheBox-APIDocs";
 	base = expandPath( "/cachebox/system" );
 
+	// Create the output directory if it doesn't exist
+	if ( !directoryExists( url.path ) ) {
+		directoryCreate( url.path );
+	}
+
 	docbox 	= new docbox.DocBox( properties = {
 		projectTitle 	= "CacheBox v#url.version#",
 		outputDir 		= url.path

apidocs/coldbox.cfm

@@ -4,6 +4,11 @@
 	docName = "ColdBox-APIDocs";
 	base = expandPath( "/coldbox/system" );
 
+	// Create the output directory if it doesn't exist
+	if ( !directoryExists( url.path ) ) {
+		directoryCreate( url.path );
+	}
+
 	docbox 	= new docbox.DocBox( properties = {
 		projectTitle 	= "ColdBox v#url.version#",
 		outputDir 		= url.path

apidocs/logbox.cfm

@@ -4,6 +4,11 @@
 	docName = "logbox-APIDocs";
 	base = expandPath( "/logbox/system" );
 
+	// Create the output directory if it doesn't exist
+	if ( !directoryExists( url.path ) ) {
+		directoryCreate( url.path );
+	}
+
 	docbox 	= new docbox.DocBox( properties = {
 		projectTitle 	= "logbox v#url.version#",
 		outputDir 		= url.path

apidocs/wirebox.cfm

@@ -4,6 +4,11 @@
 	docName = "wirebox-APIDocs";
 	base = expandPath( "/wirebox/system" );
 
+	// Create the output directory if it doesn't exist
+	if ( !directoryExists( url.path ) ) {
+		directoryCreate( url.path );
+	}
+
 	docbox 	= new docbox.DocBox( properties = {
 		projectTitle 	= "wirebox v#url.version#",
 		outputDir 		= url.path

box.json

@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Platform",
-    "version":"7.2.1",
+    "version":"7.3.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions <[email protected]>",
     "slug":"coldbox",