Skip to content

Commit bc64156

Browse files
committed
Migrated all automated tests to focal and mysql8 in preparation for latest updates
1 parent 0bef69a commit bc64156

File tree

5 files changed

+49
-16
lines changed

5 files changed

+49
-16
lines changed

.travis.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
language: java
2+
os: "linux"
3+
dist: focal
24

35
notifications:
46
slack:
@@ -18,16 +20,8 @@ branches:
1820
- development
1921
- master
2022

21-
dist: trusty
22-
23-
sudo: required
24-
25-
addons:
26-
apt:
27-
packages:
28-
- mysql-server-5.6
29-
- mysql-client-core-5.6
30-
- mysql-client-5.6
23+
services:
24+
- mysql
3125

3226
before_install:
3327
# CommandBox Keys
@@ -48,6 +42,10 @@ before_script:
4842
- printf "DB_DATABASE=cbsecurity\n" >> test-harness/.env
4943
- printf "DB_USER=root\n" >> test-harness/.env
5044
- printf "DB_PASSWORD=\n" >> test-harness/.env
45+
- printf "DB_BUNDLEVERSION=8.0.19\n" >> test-harness/.env
46+
- printf "DB_BUNDLENAME=com.mysql.cj\n" >> test-harness/.env
47+
# MySQL 8
48+
- printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> test-harness/.env
5149

5250
install:
5351
# Install Commandbox

changelog.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
----
99

10+
## [2.9.0] => 2020-DEC
11+
12+
### Fixed
13+
14+
* Fixes a typo in the `cbSecurity_onInvalidAuthorization` interception point declaration. Previously, the typo would prevent ColdBox from allowing the correctly-typed interception point from ever triggering an interception listener.
15+
* The `userValidator()` method has been changed to `roleValidator()`, but the error message was forgotten! So the developer is told they need a `userValidator()` method... because the `userValidator` method is no longer supported. :/
16+
17+
### Added
18+
19+
* Migrated all automated tests to `focal` and `mysql8` in preparation for latest updates
20+
* Add support for JSON/XML/model rules source when loading rules from modules. Each module can now load rules not only inline but from the documented external sources.
21+
* Ensure non-configured `rules` default to empty array
22+
23+
----
24+
1025
## [2.8.0] => 2020-NOV-09
1126

1227
### Added

test-harness/.cfconfig.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,22 @@
1818
"allowSelect":true,
1919
"allowUpdate":true,
2020
"blob":"false",
21-
"class":"com.mysql.jdbc.Driver",
2221
"clob":"false",
2322
"connectionTimeout":"1",
2423
"custom":"useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true&useSSL=false",
2524
"database":"cbsecurity",
2625
"dbdriver":"MySQL",
2726
"dsn":"jdbc:mysql://{host}:{port}/{database}",
28-
"host":"${DB_HOST}",
2927
"metaCacheTimeout":"60000",
30-
"password":"${DB_PASSWORD}",
3128
"port":"3306",
3229
"storage":"false",
30+
"validate":"false",
31+
"class":"${DB_CLASS}",
32+
"host":"${DB_HOST}",
33+
"password":"${DB_PASSWORD}",
3334
"username":"${DB_USERNAME}",
34-
"validate":"false"
35+
"bundleName": "${DB_BUNDLENAME}",
36+
"bundleVersion": "${DB_BUNDLEVERSION}"
3537
}
3638
},
3739
}

test-harness/.env

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
DB_HOST=localhost
22
DB_USERNAME=root
3-
DB_PASSWORD=mysql
3+
DB_PASSWORD=mysql
4+
5+
# MySQL 5.7
6+
#DB_CLASS=com.mysql.jdbc.Driver
7+
# MySQL 8
8+
DB_CLASS=com.mysql.cj.jdbc.Driver
9+
10+
# MySQL Lucee Bundle
11+
DB_BUNDLEVERSION=8.0.19
12+
DB_BUNDLENAME=com.mysql.cj

test-harness/.env.sample

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
11
DB_HOST=
22
DB_USERNAME=
3-
DB_PASSWORD=
3+
DB_PASSWORD=
4+
5+
# MySQL 5.7
6+
#DB_CLASS=com.mysql.jdbc.Driver
7+
# MySQL 8
8+
DB_CLASS=com.mysql.cj.jdbc.Driver
9+
10+
# MySQL Lucee Bundle
11+
DB_BUNDLEVERSION=8.0.19
12+
DB_BUNDLENAME=com.mysql.cj

0 commit comments

Comments
 (0)