Merge branch 'development'

.cfconfig.json

@@ -1,7 +1,15 @@
 {
-	"systemErr":"System",
-    "systemOut":"System",
 	"adminPassword" : "coldbox",
+	"ajaxDebugWindowEnabled": false,
+	"debuggingEnabled": false,
+	"debuggingReportExecutionTimes": false,
+	"inspectTemplate":"always",
+	"maxCFThreads":100,
+	"requestTimeout":"0,0,0,90",
+	"robustExceptionEnabled":true,
+	"systemErr":"System",
+	"systemOut":"System",
+	"whitespaceManagement":"white-space-pref",
     "caches": {
         "default": {
             "storage": "false",
@@ -16,19 +24,31 @@
     "cacheDefaultObject": "default",
     "datasources": {
         "coolblog": {
-            "clientHostname": false,
-            "host": "localhost",
-            "dbdriver": "MySQL",
+			"allowAlter":true,
+            "allowCreate":true,
+            "allowDelete":true,
+            "allowDrop":true,
+            "allowGrant":true,
+            "allowInsert":true,
+            "allowRevoke":true,
+            "allowSelect":true,
+			"allowUpdate":true,
+			"blob":"false",
+			"clob":"false",
+			"connectionTimeout":"1",
+            "class":"${DB_CLASS}",
+			"dbdriver": "MySQL",
+			"dsn":"jdbc:mysql://{host}:{port}/{database}",
+            "custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=America%2FChicago&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false",
+            "host":"${DB_HOST:127.0.0.1}",
+            "username": "${DB_USER}",
             "password": "${DB_PASSWORD}",
-            "dsn": "${DB_CONNECTIONSTRING}",
-            "custom": "",
-            "username": "${DB_USER:root}",
             "database": "coolblog",
-            "port": "3306"
+			"port": "${DB_PORT:3306}",
+			"storage":"false",
+			"bundleName": "${DB_BUNDLENAME}",
+			"bundleVersion": "${DB_BUNDLEVERSION}",
+			"validate":"false"
         }
-    },
-    "debuggingEnabled": false,
-    "ajaxDebugWindowEnabled": false,
-    "debuggingReportExecutionTimes": false,
-    "maxCFThreads":100
+    }
 }

.cfformat.json

@@ -41,7 +41,7 @@
 	"keywords.spacing_to_block": "spaced",
 	"keywords.spacing_to_group": true,
 	"keywords.empty_group_spacing": false,
-	"max_columns": 100,
+	"max_columns": 115,
 	"metadata.multiline.element_count": 3,
 	"metadata.multiline.min_length": 50,
 	"method_call.chain.multiline" : 3,

.env.template

@@ -1,4 +1,7 @@
-DB_CLASS=com.mysql.jdbc.Driver
-DB_CONNECTIONSTRING=jdbc:mysql://localhost:3306/coolblog?useUnicode=true&characterEncoding=UTF-8&useLegacyDatetimeCode=true&autoConfigureForColdFusion=false&serverTimezone=UTC
+DB_HOST=127.0.0.1
+DB_PORT=3306
 DB_USER=root
-DB_PASSWORD=
+DB_PASSWORD=mysql
+DB_CLASS=com.mysql.jdbc.Driver
+DB_BUNDLEVERSION=8.0.19
+DB_BUNDLENAME=com.mysql.cj

.travis.yml

@@ -1,6 +1,6 @@
 language: java
 os: "linux"
-group: deprecated-2017Q2
+dist: focal
 
 notifications:
   slack:
@@ -9,7 +9,7 @@ notifications:
 env:
   global:
     # TARGET RELEASE VERSION: BUMP AS NEEDED
-    - COLDBOX_VERSION=6.1.0
+    - COLDBOX_VERSION=6.2.0
     - COLDBOX_PRERELEASE=false
   matrix:
     - ENGINE=lucee@5 # Build Entire Frameworks
@@ -21,15 +21,8 @@ branches:
   - development
   - master
 
-dist: xenial
 services:
   - mysql
-#addons:
-#  apt:
-#    packages:
-#    - mysql-server-5.6
-#    - mysql-client-core-5.6
-#    - mysql-client-5.6
 
 before_install:
   # CommandBox Keys
@@ -52,27 +45,36 @@ before_script:
   - mysql -u root -e 'create database coolblog;'
   # import database
   - mysql -u root < tests/resources/coolblog.sql
-  # add our custom engine to our properties
-  - printf "\ncfengine=$ENGINE" >> build/build.properties
-  - echo "************************ Runtime Properties ********************"
-  - cat build/build.properties
-  - echo "************************ END Runtime Properties ********************"
-  # Starting server twice due to stupid LUCEE 5 bug.
-  - box server start name=$ENGINE debug=true
+  # Seed our .env
+  - echo "Seeding .env file"
+  - touch .env
+  - printf "DB_USER=travis\n" >> .env
+  - printf "DB_PASSWORD=\n" >> .env
+  - printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
+  - printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
+  # This is the key for MySQL 8 to work
+  - printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
 
 script:
+  # install dependencies
+  - box install
+  - cd apidocs && box install
+  - cd $TRAVIS_BUILD_DIR
+  # Startup the server to test
+  - box server start serverConfigFile="server-${ENGINE}.json" --debug
   # Execute build via ANT
   - ant -DisPreRelease=${COLDBOX_PRERELEASE} -Dcoldbox.version=$COLDBOX_VERSION -DisTravis=true -Dbuild.branch=$TRAVIS_BRANCH -Dbuild.number=$TRAVIS_BUILD_NUMBER -f build/build.xml $ANT_TARGET
   #- ls -l $TRAVIS_BUILD_DIR
 
 after_failure:
   - cd $TRAVIS_BUILD_DIR
+  - box cfconfig show
   # Get response from test server to see what went wrong
   - curl http://localhost:8599/tests/runner.cfm?reporter=text
-  - curl http://localhost:8599/tests/tools/IDEDictionaries/builderDictionary.cfm?text=true
+  #- curl http://localhost:8599/tests/tools/IDEDictionaries/builderDictionary.cfm?text=true
   # Spit out our Commandbox log in case we need to debug
-  - box server log name=$ENGINE
-  - cat `box system-log`
+  - box server log serverConfigFile="server-${ENGINE}.json"
+  #- cat `box system-log`
   - ls -lr $TRAVIS_BUILD_DIR
 
 deploy:
@@ -148,4 +150,4 @@ after_deploy:
   # publish WireBox
   - cd $TRAVIS_BUILD_DIR/artifacts/wirebox/$COLDBOX_VERSION && box forgebox publish
   # publish LogBox
-  - cd $TRAVIS_BUILD_DIR/artifacts/logbox/$COLDBOX_VERSION && box forgebox publish
+  - cd $TRAVIS_BUILD_DIR/artifacts/logbox/$COLDBOX_VERSION && box forgebox publish

apidocs/box.json

@@ -5,10 +5,8 @@
     "dependencies":{
         "docbox":"^2.0.7"
     },
-    "devDependencies":{
-
-    },
+    "devDependencies":{},
     "installPaths":{
-        "docbox":"docbox"
+        "docbox":"docbox/"
     }
 }

box.json

@@ -39,7 +39,11 @@
         ]
     },
     "devDependencies":{
-        "testbox":"^4.1.0"
+        "testbox":"^4.1.0",
+        "commandbox-dotenv":"*",
+        "commandbox-cfconfig":"*",
+		"commandbox-cfformat":"*",
+		"commandbox-docbox":"*"
     },
     "installPaths":{
         "testbox":"testbox/"