### Added

- Tons of updates to automated testing
- Automated tewsting for Lucee 6
- Automated testing for Adobe 2023

### Changed

- Changed the way of creating base criteria queries due to Adobe bug.

.github/workflows/release.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/[email protected]
@@ -50,7 +50,7 @@ jobs:
           fi
 
       - name: Update changelog [unreleased] with latest version
-        uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
+        uses: thomaseizinger/keep-a-changelog-new-release@3.0.0
         if: env.SNAPSHOT == 'false'
         with:
           changelogPath: ./changelog.md
@@ -64,7 +64,7 @@ jobs:
           box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
 
       - name: Commit Changelog To Master
-        uses: EndBug/[email protected].1
+        uses: EndBug/[email protected].4
         if: env.SNAPSHOT == 'false'
         with:
           author_name: Github Actions
@@ -73,7 +73,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.VERSION }}"
@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.MODULE_ID }}
           path: |
@@ -118,7 +118,7 @@ jobs:
           box forgebox publish --force
 
       - name: Create Github Release
-        uses: taiki-e/create-gh-release-action@v1.6.2
+        uses: taiki-e/create-gh-release-action@v1.8.2
         continue-on-error: true
         if: env.SNAPSHOT == 'false'
         with:
@@ -138,7 +138,7 @@ jobs:
     steps:
       # Checkout development
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: development
 
@@ -148,7 +148,7 @@ jobs:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
       - name: Download build artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           name: ${{ env.MODULE_ID }}
           path: .tmp
@@ -165,7 +165,7 @@ jobs:
 
       # Commit it back to development
       - 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/tests.yml

@@ -18,29 +18,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
-        coldboxVersion: [ "^6.0.0" ]
+        cfengine: [ "lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023" ]
+        coldboxVersion: [ "^6.0.0", "^7.0.0" ]
         experimental: [ false ]
         include:
-          - cfengine: "adobe@2023"
-            coldboxVersion: "^6.0.0"
-            experimental: true
-          - cfengine: "[email protected]"
-            coldboxVersion: "^6.0.0"
-            experimental: true
           - coldboxVersion: "be"
             cfengine: "lucee@5"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "adobe@2018"
+            cfengine: "lucee@6"
+            experimental: true
+          - coldboxVersion: "be"
+            cfengine: "adobe@2023"
             experimental: true
           - coldboxVersion: "be"
             cfengine: "adobe@2021"
             experimental: true
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
 
       - name: Setup Java
         uses: actions/setup-java@v3
@@ -98,7 +94,7 @@ jobs:
 
       - name: Upload Test Results to Artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
           path: |
@@ -111,7 +107,7 @@ jobs:
 
       - name: Upload Debug Logs To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
           path: |

changelog.md

@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Tons of updates to automated testing
+- Automated tewsting for Lucee 6
+- Automated testing for Adobe 2023
+
+### Changed
+
+- Changed the way of creating base criteria queries due to Adobe bug.
+
 ## [4.4.0] - 2023-04-19
 
 ### Added

models/BaseORMService.cfc

@@ -1917,7 +1917,7 @@ process(
 		// mix in yourself as a dependency
 		arguments.ormService = this;
 		// create new criteria builder, it's a transient
-		return variables.wirebox.getInstance( "CriteriaBuilder@cborm", arguments );
+		return new criterion.CriteriaBuilder( argumentCollection = arguments );
 	}
 
 

server-lucee@5.json

@@ -22,5 +22,8 @@
     "openBrowser":"false",
     "cfconfig":{
         "file":".cfconfig.json"
+    },
+	"env":{
+        "LUCEE_EXTENSIONS":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
     }
 }

server-lucee@6.json

@@ -22,5 +22,8 @@
     "openBrowser":"false",
     "cfconfig":{
         "file":".cfconfig.json"
+    },
+	"env":{
+        "LUCEE_EXTENSIONS":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
     }
 }