Skip to content

Commit f12e7c1

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 262ec03 + e4305fc commit f12e7c1

File tree

168 files changed

+4325
-3551
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+4325
-3551
lines changed

‎.cfconfig.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"adminPassword" : "coldbox",
33
"ajaxDebugWindowEnabled": false,
4-
"debuggingEnabled": false,
4+
"debuggingEnabled": true,
55
"debuggingReportExecutionTimes": false,
66
"debuggingShowDatabase" : true,
77
"inspectTemplate":"once",
@@ -23,6 +23,10 @@
2323
}
2424
},
2525
"cacheDefaultObject": "default",
26+
"experimental" : {
27+
"ASTCapture": false,
28+
"compiler": "asm"
29+
},
2630
"datasources": {
2731
"coolblog": {
2832
"allowAlter":true,
@@ -40,7 +44,7 @@
4044
"class":"${DB_CLASS}",
4145
"dbdriver": "MySQL",
4246
"dsn":"jdbc:mysql://{host}:{port}/{database}",
43-
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false",
47+
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true",
4448
"host":"${DB_HOST:127.0.0.1}",
4549
"username": "${DB_USER}",
4650
"password": "${DB_PASSWORD}",

‎.github/workflows/cron.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Daily Test Run
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # Runs at 00:00 UTC every day
6+
7+
jobs:
8+
tests:
9+
uses: ./.github/workflows/tests.yml
10+
secrets: inherit

‎.github/workflows/lts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
##########################################################################################
1919
format:
2020
name: Code Auto-Formatting
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@v4
2424

2525
- name: Auto-format
26-
uses: Ortus-Solutions/commandbox-action@v1.0.2
26+
uses: Ortus-Solutions/commandbox-action@v1.0.3
2727
with:
2828
cmd: run-script format
2929

3030
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
31+
uses: stefanzweifel/git-auto-commit-action@v5
3232
with:
3333
commit_message: Apply cfformat changes
3434
push_options: --force

‎.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
format_check:
2121
name: Checks Source Code Formatting
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@v4.2.0
25+
uses: actions/checkout@v4
2626

2727
- uses: Ortus-Solutions/commandbox-action@v1.0.2
2828
with:

‎.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
#############################################
3838
build:
3939
name: Build & Publish Release
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-24.04
4141
steps:
4242
- name: Checkout Repository
4343
uses: actions/checkout@v4
@@ -51,6 +51,7 @@ jobs:
5151
- name: Setup CommandBox
5252
uses: Ortus-Solutions/setup-commandbox@v2.0.1
5353
with:
54+
install: commandbox-boxlang
5455
forgeboxAPIKey: ${{ secrets.FORGEBOX_API_TOKEN }}
5556

5657
- name: Setup Environment Variables For Build Process
@@ -195,9 +196,11 @@ jobs:
195196

196197
- name: Copy Changelog
197198
run: |
198-
cp .tmp/changelog.md changelog.md
199+
ls -lR .tmp/
200+
cp .tmp/changelog.md changelog.md || true
199201
200202
- name: Bump Version
203+
if: ${{ always() }}
201204
run: |
202205
if [ $LTS == 'true' ]
203206
then
@@ -209,6 +212,7 @@ jobs:
209212
210213
- name: Commit Version Bump
211214
uses: EndBug/add-and-commit@v9.1.4
215+
if: ${{ always() }}
212216
with:
213217
author_name: Github Actions
214218
author_email: info@ortussolutions.com

‎.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
##########################################################################################
2626
format:
2727
name: Code Auto-Formatting
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2929
steps:
3030
- uses: actions/checkout@v4
3131

‎.github/workflows/tests.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,26 @@ on:
1111
jobs:
1212
tests:
1313
name: Test Suites
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
15+
timeout-minutes: ${{ matrix.timeoutMinutes }}
1516
env:
1617
DB_USER: root
1718
DB_PASSWORD: root
1819
continue-on-error: ${{ matrix.experimental }}
1920
strategy:
2021
fail-fast: false
2122
matrix:
22-
commandbox_version: [ "6.0.1" ]
23-
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
24-
jdkVersion: [ "11" ]
23+
commandbox_version: [ "6.2.0" ]
24+
cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
25+
jdkVersion: [ "21" ]
2526
experimental: [false]
27+
timeoutMinutes: [ 8 ]
2628
include:
27-
- cfengine: "lucee@6"
28-
jdkVersion: "17"
29-
commandbox_version: "6.0.1"
29+
- cfengine: "adobe@2025"
30+
jdkVersion: "21"
31+
commandbox_version: "6.2.0"
3032
experimental: true
31-
- cfengine: "adobe@2023"
32-
jdkVersion: "17"
33-
commandbox_version: "6.0.1"
34-
experimental: false
33+
timeoutMinutes: 8
3534
steps:
3635
- name: Checkout Repository
3736
uses: actions/checkout@v4
@@ -52,6 +51,7 @@ jobs:
5251
uses: Ortus-Solutions/setup-commandbox@v2.0.1
5352
with:
5453
version: ${{ matrix.commandbox_version }}
54+
install: commandbox-boxlang
5555

5656
- name: Setup .env For Runner
5757
run: |
@@ -68,7 +68,7 @@ jobs:
6868
- name: Install Dependencies
6969
run: |
7070
# Core dependencies
71-
box install
71+
box install --verbose
7272
7373
- name: Start ${{ matrix.cfengine }} Server
7474
run: |

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ test-harness/config/runtime.properties.cfm
3939
.env
4040
/settings.xml
4141
/.settings/
42+
grapher/data/**

‎box-cachebox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"*/.md"
2626
],
2727
"dependencies":{
28-
"cbproxies":"^1.0.1+13"
28+
"cbproxies":"^1"
2929
},
3030
"installPaths":{
3131
"cbproxies":"system/async/cbproxies/"

‎box-logbox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"*/.md"
2626
],
2727
"dependencies":{
28-
"cbproxies":"^1.0.1+13"
28+
"cbproxies":"^1"
2929
},
3030
"installPaths":{
3131
"cbproxies":"system/async/cbproxies/"

‎box-original.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"*/.md"
3434
],
3535
"dependencies": {
36-
"cbproxies": "^1.0.1+13"
36+
"cbproxies":"^1"
3737
},
3838
"devDependencies": {
3939
},

‎box-wirebox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"*/.md"
2727
],
2828
"dependencies":{
29-
"cbproxies":"^1.0.1+13"
29+
"cbproxies":"^1"
3030
},
3131
"installPaths":{
3232
"cbproxies":"system/async/cbproxies/"

‎box.json

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ColdBox Platform",
3-
"version":"7.3.1",
3+
"version":"7.4.0",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox/@build.version@/coldbox-@build.version@.zip",
55
"author":"Ortus Solutions <info@ortussolutions.com>",
66
"slug":"coldbox",
@@ -39,12 +39,11 @@
3939
]
4040
},
4141
"dependencies":{
42-
"cbproxies":"^1.0.1+13"
42+
"cbproxies":"^1"
4343
},
4444
"devDependencies":{
45-
"testbox":"^5.1.0+2",
46-
"commandbox-dotenv":"*",
47-
"commandbox-cfconfig":"*",
45+
"testbox":"*",
46+
"commandbox-boxlang":"*",
4847
"commandbox-cfformat":"*"
4948
},
5049
"scripts":{
@@ -63,19 +62,14 @@
6362
"format:watch":"cfformat watch system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
6463
"format:check":"cfformat check system/**/*.cfc,tests/specs/**/*.cfc ./.cfformat.json",
6564
"start:lucee":"server start serverConfigFile='server-lucee@5.json' --force",
66-
"start:2018":"server start serverConfigFile='server-adobe@2018.json' --force",
67-
"start:2021":"server start serverConfigFile='server-adobe@2021.json' --force",
65+
"start:boxlang":"server start serverConfigFile='server-boxlang-cfml@1.json' --force",
6866
"start:2023":"server start serverConfigFile='server-adobe@2023.json' --force",
6967
"stop:lucee":"server stop serverConfigFile='server-lucee@5.json' --force",
70-
"stop:2018":"server stop serverConfigFile='server-adobe@2018.json' --force",
71-
"stop:2021":"server stop serverConfigFile='server-adobe@2021.json' --force",
68+
"stop:boxlang":"server stop serverConfigFile='server-boxlang-cfml@1.json' --force",
7269
"stop:2023":"server stop serverConfigFile='server-adobe@2023.json' --force",
7370
"log:lucee":"server log coldbox-lucee@5 --follow",
74-
"log:2018":"server log coldbox-adobe@2018 --follow",
75-
"log:2021":"server log coldbox-adobe@2021 --follow",
76-
"log:2023":"server log coldbox-adobe@2023 --follow",
77-
"cfpm":"echo '\".engine/acf2021/WEB-INF/cfusion/bin/cfpm.sh\"' | run",
78-
"cfpm:install":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\" install ${1}' | run"
71+
"log:boxlang":"server log coldbox-boxlang-cfml@1 --follow",
72+
"log:2023":"server log coldbox-adobe@2023 --follow"
7973
},
8074
"installPaths":{
8175
"testbox":"testbox/",

‎changelog.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,71 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
### ColdBox HMVC
13+
14+
#### Improvement
15+
16+
- [COLDBOX-1286](https://ortussolutions.atlassian.net/browse/COLDBOX-1286) Make sure global scheduler is loaded after modules load.
17+
- [COLDBOX-1287](https://ortussolutions.atlassian.net/browse/COLDBOX-1287) If running scheduled tasks manually with a \`force\` then do not set the next run since this is a forced run.
18+
- [COLDBOX-1288](https://ortussolutions.atlassian.net/browse/COLDBOX-1288) Allow Disabling of PrettyJson in Log Output
19+
- [COLDBOX-1294](https://ortussolutions.atlassian.net/browse/COLDBOX-1294) Call \`reset\(\)\` when testing and unloadColdbox is true in the \`afterTests\(\)\` to make sure the reset procedures are done, not only the shutdown.
20+
- [COLDBOX-1305](https://ortussolutions.atlassian.net/browse/COLDBOX-1305) Improvement: Update Config Seeding to Include Original Module Settings
21+
22+
#### New Features
23+
24+
- [COLDBOX-1285](https://ortussolutions.atlassian.net/browse/COLDBOX-1285) BoxLang Support so you can write your ColdBox apps in BoxLang
25+
- [COLDBOX-1296](https://ortussolutions.atlassian.net/browse/COLDBOX-1296) New flow peek\(\) method to do fluent peeks in objects
26+
- [COLDBOX-1297](https://ortussolutions.atlassian.net/browse/COLDBOX-1297) Schedulers now have a startupTask\( task \) to dynamically startup a task by name or task object
27+
- [COLDBOX-1306](https://ortussolutions.atlassian.net/browse/COLDBOX-1306) Better tracking of status code and text on the request context so integration tests are not corrupted by response commitment: getStatusCode\(\), getStatusText\(\) accessors
28+
29+
#### Bugs
30+
31+
- [COLDBOX-1280](https://ortussolutions.atlassian.net/browse/COLDBOX-1280) coldbox.system.cache.policies.LRU cleanup errors
32+
- [COLDBOX-1281](https://ortussolutions.atlassian.net/browse/COLDBOX-1281) DateTimeHelper.validateTime Regression
33+
- [COLDBOX-1282](https://ortussolutions.atlassian.net/browse/COLDBOX-1282) ScheduledTasks Bug - java.util.concurrent.TimeUnit type error
34+
- [COLDBOX-1289](https://ortussolutions.atlassian.net/browse/COLDBOX-1289) Directory Helper Logic in Renderer.cfc is Incorrect and Generates Bad Path On Windows
35+
- [COLDBOX-1295](https://ortussolutions.atlassian.net/browse/COLDBOX-1295) Dumps in BugReport.cfm need top attributes
36+
- [COLDBOX-1304](https://ortussolutions.atlassian.net/browse/COLDBOX-1304) thisLocationToken is not var scoped
37+
- [COLDBOX-1311](https://ortussolutions.atlassian.net/browse/COLDBOX-1311) Remove direct calls to the servlet response.setStatus\( int, String \) methods due to jakarta removing statusText
38+
- [COLDBOX-1317](https://ortussolutions.atlassian.net/browse/COLDBOX-1317) ACF 2025 has removed htmlEditFormat
39+
- [COLDBOX-1326](https://ortussolutions.atlassian.net/browse/COLDBOX-1326) populator discover entity name not accouting for missing entityname
40+
- [COLDBOX-1327](https://ortussolutions.atlassian.net/browse/COLDBOX-1327) \`layoutLocations\` variable error when using event.noLayout\(\)
41+
42+
### CacheBox
43+
44+
#### New Feature
45+
46+
- [CACHEBOX-87](https://ortussolutions.atlassian.net/browse/CACHEBOX-87) BoxLang Providers
47+
- [CACHEBOX-88](https://ortussolutions.atlassian.net/browse/CACHEBOX-88) New approach for indexing objects on object stores to allow for concurrency and without separating indexers
48+
49+
#### Bug
50+
51+
- [CACHEBOX-86](https://ortussolutions.atlassian.net/browse/CACHEBOX-86) JDBCStore has double now overrides when doing insert/updates on caching. Remove one of them
52+
53+
#### Improvement
54+
55+
- [CACHEBOX-42](https://ortussolutions.atlassian.net/browse/CACHEBOX-42) Rewrite CacheBox DiskStore to not rely on in-memory indexer
56+
57+
### LogBox
58+
59+
#### Bug
60+
61+
- [LOGBOX-81](https://ortussolutions.atlassian.net/browse/LOGBOX-81) Make the Rolling File Appender rotator task timer configurable: rotatorSchedulerMinutes property
62+
- [LOGBOX-82](https://ortussolutions.atlassian.net/browse/LOGBOX-82) LogBox Rolling file threads rotator running on an insane millisecond timer instead of minutes
63+
64+
### WireBox
65+
66+
#### Bug
67+
68+
- [WIREBOX-155](https://ortussolutions.atlassian.net/browse/WIREBOX-155) ExceptionBean is referenced but not shipped with Standalone install
69+
70+
1271
## [7.3.1] - 2025-03-02
1372

73+
### Bug
74+
75+
- [COLDBOX-1293](https://ortussolutions.atlassian.net/browse/COLDBOX-1293) DBAppender with SQL Server Not Compatible with Adobe 2023
76+
1477
## [7.3.0] - 2024-05-13
1578

1679
### New Feature

‎readme.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ Holy Ghost which is given unto us. ." Romans 5:5
3333

3434
----
3535

36-
# Welcome to ColdBox
36+
# Welcome to ColdBox HMVC
3737

38-
ColdBox *Hierarchical* MVC is the de-facto enterprise-level [HMVC](https://en.wikipedia.org/wiki/Hierarchical_model%E2%80%93view%E2%80%93controller) framework for ColdFusion (CFML) developers. It's professionally backed, conventions-based, modular, highly extensible, and productive. Getting started with ColdBox is quick and painless. ColdBox takes the pain out of development by giving you a standardized methodology for modern ColdFusion (CFML) development with features such as:
38+
ColdBox *Hierarchical* MVC is the de-facto enterprise-level [HMVC](https://en.wikipedia.org/wiki/Hierarchical_model%E2%80%93view%E2%80%93controller) framework for the [BoxLang](https://www.boxlang.io) JVM Language and for the ColdFusion (CFML) Language. It's professionally backed, conventions-based, modular, highly extensible, and productive. Getting started with ColdBox is quick and painless. ColdBox takes the pain out of development by giving you a standardized methodology for modern web development with features such as:
3939

4040
* [Conventions instead of configuration](https://coldbox.ortusbooks.com/getting-started/conventions)
4141
* [Modern URL routing](https://coldbox.ortusbooks.com/the-basics/routing)
@@ -54,14 +54,15 @@ ColdBox *Hierarchical* MVC is the de-facto enterprise-level [HMVC](https://en.wi
5454

5555
For all ColdBox releases, updates are provided for 12 months and security fixes are provided for 2 years after the next major release.
5656

57-
**ColdBox 6.x will receive bug fixes until 2024 and security fixes until 2025.**
57+
* **ColdBox 6.x will receive bug fixes until 2024 and security fixes until 2025.**
58+
* **ColdBox 7.x will receive bug fixes until 2025 and security fixes until 2026.**
5859

5960
| Version | Release | Updates | Security Fixes |
6061
| ------- | ------- | --------- | -------------- |
6162
| 6.x | 2022 | 2023 | 2025 |
62-
| 7.x | 2023 | 2024 | 2026 |
63-
| 8.x | 2024 | 2025 | 2027 |
64-
| 9.x | 2025 | 2026 | 2028 |
63+
| 7.x | 2023 | 2025 | 2026 |
64+
| 8.x | 2025 | 2026 | 2027 |
65+
| 9.x | 2026 | 2027 | 2028 |
6566

6667

6768
## License
@@ -113,6 +114,7 @@ And constructed with the following guidelines:
113114

114115
## System Requirements
115116

117+
* BoxLang 1+
116118
* Lucee 5+
117119
* Adobe ColdFusion 2018+
118120

@@ -122,7 +124,7 @@ Please go to our [documentation](https://coldbox.ortusbooks.com) for expanded in
122124

123125
**CommandBox (Recommended)**
124126

125-
We recommend you use [CommandBox](https://www.ortussolutions.com/products/commandbox), our CFML CLI and package manager, to install ColdBox.
127+
We recommend you use [CommandBox](https://www.ortussolutions.com/products/commandbox), our CLI and package manager, to install ColdBox.
126128

127129
**Stable Release**
128130

@@ -138,7 +140,7 @@ Bleeding edge releases are updated automatically when code is committed.
138140

139141
First, read our [contributing](CONTRIBUTING.md) guidelines, then you will need to download [CommandBox](https://www.ortussolutions.com/products/commandbox) so you can install dependencies, run the development server and much more.
140142

141-
Then you need to install some CommandBox modules in order to work with environment variables and CFML engine configuration. Once you fork/clone the repository, startup a CommandBox shell in the root of the project via `box` and then install all of the project development dependencies:
143+
Then you need to install some CommandBox modules in order to work with environment variables and engine configuration. Once you fork/clone the repository, startup a CommandBox shell in the root of the project via `box` and then install all of the project development dependencies:
142144

143145
```bash
144146
install

0 commit comments

Comments
 (0)