Merge branch 'development'

GunnarLieb · May 13, 2024 · 39fc612 · 39fc612
2 parents 2f9219c + 961a451
commit 39fc612
Show file tree

Hide file tree

Showing 34 changed files with 275 additions and 104 deletions.
diff --git a/.github/workflows/lts.yml b/.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]

diff --git a/.github/workflows/pr.yml b/.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:

diff --git a/.github/workflows/release.yml b/.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]

diff --git a/.github/workflows/snapshot.yml b/.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]

diff --git a/.github/workflows/tests.yml b/.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
diff --git a/apidocs/cachebox.cfm b/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

diff --git a/apidocs/coldbox.cfm b/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

diff --git a/apidocs/logbox.cfm b/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

diff --git a/apidocs/wirebox.cfm b/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

diff --git a/box.json b/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",

diff --git a/build/release.boxr b/build/release.boxr
@@ -7,19 +7,8 @@
 # Merge development into it for release
 !git merge --no-ff development
 
-# Tag the master repo with the version from box.json
-!git tag v`box package show version`
-
 # Push all branches back out to github
 !git push origin --all
 
-# Push all tags
-!git push origin --tags
-
 # Check development again
 !git checkout -f development
-
-# Bump to prepare for a new release, do minor, change if needed and don't tag
-bump --minor --!tagVersion
-!git commit -a -m "version bump"
-!git push origin development
diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### New Feature
+
+- Prettier SQL printing in `StringUtil.prettySQL()`
+- [COLDBOX-1270](https://ortussolutions.atlassian.net/browse/COLDBOX-1270) Abililty to restart schedulers with a \`restart\(\)\` method
+
+### Improvement
+
+- [COLDBOX-1268](https://ortussolutions.atlassian.net/browse/COLDBOX-1268) WireBox Singleton auto reload now only affects app singletons and not core singletons
+- [COLDBOX-1269](https://ortussolutions.atlassian.net/browse/COLDBOX-1269) Do not add double headers if \`event.setHTTPHeader\(\)\` is called more than once
+- [COLDBOX-1273](https://ortussolutions.atlassian.net/browse/COLDBOX-1273) Removal of deprecated CFML functions in core
+- [COLDBOX-1275](https://ortussolutions.atlassian.net/browse/COLDBOX-1275) Improved engine detection by the CFMLEngine feature class
+- [COLDBOX-1278](https://ortussolutions.atlassian.net/browse/COLDBOX-1278) Remove unsafe evaluate function usage
+
+### Bug
+
+- [COLDBOX-1266](https://ortussolutions.atlassian.net/browse/COLDBOX-1266) Logger for MS SQL using date not datetime.
+- [COLDBOX-1267](https://ortussolutions.atlassian.net/browse/COLDBOX-1267) Lucee only isEmpty function call
+- [COLDBOX-1279](https://ortussolutions.atlassian.net/browse/COLDBOX-1279) Render encapsulator bleed of this scope by engines
+
 ## [7.2.1] - 2023-12-11
 
 ### ColdBox HMVC

diff --git a/[email protected] b/[email protected]
@@ -1,6 +1,6 @@
 {
     "app":{
-        "cfengine":"lucee@5.4",
+        "cfengine":"lucee@5",
         "serverHomeDirectory":".engine/lucee5"
     },
     "name":"coldbox-lucee@5",

diff --git a/[email protected] b/[email protected]
@@ -1,6 +1,6 @@
 {
     "app":{
-        "cfengine":"lucee@6.0.0-snapshot",
+        "cfengine":"lucee@6",
         "serverHomeDirectory":".engine/lucee6"
     },
     "name":"coldbox-lucee@6",

diff --git a/system/Bootstrap.cfc b/system/Bootstrap.cfc
@@ -191,7 +191,7 @@ component serializable="false" accessors="true" {
 			// WireBox Singleton AutoReload
 			if ( cbController.getSetting( "Wirebox" ).singletonReload ) {
 				lock type="exclusive" name="#appHash#" timeout="#lockTimeout#" throwontimeout="true" {
-					cbController.getWireBox().clearSingletons();
+					cbController.getWireBox().clearAppSingletons();
 				}
 			}
 			// Handler's Index Auto Reload
@@ -737,9 +737,10 @@ component serializable="false" accessors="true" {
 	 * Helper method to deal with ACF's overload of the page context response, come on Adobe, get your act together!
 	 */
 	private function getPageContextResponse(){
-		return server.keyExists( "lucee" ) ? getPageContext().getResponse() : getPageContext()
-			.getResponse()
-			.getResponse();
+		if ( server.keyExists( "coldfusion" ) && server.coldfusion.productName.findNoCase( "ColdFusion" ) ) {
+			return getPageContext().getResponse().getResponse();
+		}
+		return getPageContext().getResponse();
 	}
 
 }
diff --git a/system/RestHandler.cfc b/system/RestHandler.cfc
@@ -176,7 +176,9 @@ component extends="EventHandler" {
 	){
 		// Try to discover exception, if not, hard error
 		if (
-			!isNull( arguments.prc.exception ) && ( isNull( arguments.exception ) || isEmpty( arguments.exception ) )
+			!isNull( arguments.prc.exception ) && (
+				isNull( arguments.exception ) || structIsEmpty( arguments.exception )
+			)
 		) {
 			arguments.exception = arguments.prc.exception.getExceptionStruct();
 		}