Skip to content

Commit 8a38c19

Browse files
committed
Merge branch 'development'
2 parents bf01754 + 4c2fb7b commit 8a38c19

File tree

5 files changed

+17
-10
lines changed

5 files changed

+17
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.artifacts/**
44
.tmp/**
5+
modules/**
56

67
test-harness/.engine/**
78
test-harness/coldbox/**

.travis.yml

Lines changed: 2 additions & 4 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,10 +20,6 @@ branches:
1820
- development
1921
- master
2022

21-
dist: trusty
22-
23-
sudo: required
24-
2523
before_install:
2624
# CommandBox Keys
2725
- curl -fsSl https://downloads.ortussolutions.com/debs/gpg | sudo apt-key add -

box.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"ColdBox Validation",
33
"author":"Ortus Solutions <[email protected]>",
4-
"version":"2.3.0",
4+
"version":"3.0.0",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
66
"slug":"cbvalidation",
77
"type":"modules",
@@ -11,7 +11,7 @@
1111
"type":"git",
1212
"url":"https://github.com/coldbox-modules/cbvalidation"
1313
},
14-
"shortDescription":"This module provides server side validation to ColdBox applications",
14+
"shortDescription":"This module provides server side validation to ColdBox applications with localization and i18n support",
1515
"license":[
1616
{
1717
"type":"Apache2",
@@ -23,7 +23,7 @@
2323
"Curt Gratz <[email protected]>"
2424
],
2525
"dependencies":{
26-
"cbi18n":"^1.4.0"
26+
"cbi18n":"^2.0.0"
2727
},
2828
"ignore":[
2929
"**/.*",

changelog.md

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

88
----
99

10+
## [3.0.0] => 2021-JAN-20
11+
12+
### Added
13+
14+
* Migration to cbi18n 2.x series. This will require for you to update your cbi18n settings in your ColdBox configuration file and the modules that leverage cbi18n. Please see https://coldbox-i18n.ortusbooks.com/intro/release-history/whats-new-with-2.0.0#compatibility-updates on how to upgrade your application easily in about 5 minutes.
15+
16+
----
17+
1018
## [2.3.0] => 2020-NOV-09
1119

1220
### Added

test-harness/box.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"private":true,
66
"description":"",
77
"dependencies":{
8-
"coldbox":"^5.0.0",
9-
"cbi18n":"^1.4.0",
10-
"testbox":"^3.1.0+339"
8+
"coldbox":"^6.0.0",
9+
"cbi18n":"^2.0.0",
10+
"testbox":"^4.0.0"
1111
},
1212
"installPaths":{
1313
"coldbox":"coldbox/",

0 commit comments

Comments
 (0)