Merge branch 'development'

.cflintrc

@@ -0,0 +1,69 @@
+{
+    "output": [],
+    "rule": [],
+    "includes": [
+        { "code": "AVOID_USING_STRUCTNEW" },
+        { "code": "AVOID_USING_ARRAYNEW" },
+        { "code": "AVOID_USING_CFINCLUDE_TAG" },
+		{ "code": "AVOID_USING_CFABORT_TAG" },
+		{ "code": "AVOID_USING_CFEXECUTE_TAG" },
+		{ "code": "AVOID_USING_DEBUG_ATTR" },
+		{ "code": "AVOID_USING_CREATEOBJECT" },
+		{ "code": "AVOID_USING_ABORT" },
+		{ "code": "AVOID_USING_ISDATE" },
+		{ "code": "AVOID_USING_ISDEBUGMODE" },
+		{ "code": "AVOID_USING_CFINSERT_TAG" },
+		{ "code": "AVOID_USING_CFUPDATE_TAG" },
+		{ "code": "ARG_VAR_CONFLICT" },
+		{ "code": "ARG_VAR_MIXED" },
+		{ "code": "ARG_HINT_MISSING" },
+		{ "code": "ARG_HINT_MISSING_SCRIPT" },
+		{ "code" : "ARGUMENT_INVALID_NAME" },
+		{ "code" : "ARGUMENT_ALLCAPS_NAME" },
+		{ "code" : "ARGUMENT_TOO_WORDY" },
+		{ "code" : "ARGUMENT_IS_TEMPORARY" },
+        { "code": "CFQUERYPARAM_REQ" },
+        { "code": "COMPARE_INSTEAD_OF_ASSIGN" },
+		{ "code": "COMPONENT_HINT_MISSING" },
+		{ "code" : "COMPONENT_INVALID_NAME" },
+		{ "code" : "COMPONENT_ALLCAPS_NAME" },
+		{ "code" : "COMPONENT_TOO_SHORT" },
+		{ "code" : "COMPONENT_TOO_LONG" },
+		{ "code" : "COMPONENT_TOO_WORDY" },
+		{ "code" : "COMPONENT_IS_TEMPORARY" },
+		{ "code" : "COMPONENT_HAS_PREFIX_OR_POSTFIX" },
+		{ "code": "COMPLEX_BOOLEAN_CHECK" },
+        { "code": "EXCESSIVE_FUNCTION_LENGTH" },
+        { "code": "EXCESSIVE_COMPONENT_LENGTH" },
+        { "code": "EXCESSIVE_ARGUMENTS" },
+		{ "code": "EXCESSIVE_FUNCTIONS" },
+		{ "code": "EXPLICIT_BOOLEAN_CHECK" },
+        { "code": "FUNCTION_TOO_COMPLEX" },
+		{ "code": "FUNCTION_HINT_MISSING" },
+		{ "code": "FILE_SHOULD_START_WITH_LOWERCASE" },
+        { "code": "LOCAL_LITERAL_VALUE_USED_TOO_OFTEN" },
+		{ "code": "GLOBAL_VAR" },
+        { "code": "GLOBAL_LITERAL_VALUE_USED_TOO_OFTEN" },
+		{ "code": "MISSING_VAR" },
+		{ "code" : "METHOD_INVALID_NAME" },
+		{ "code" : "METHOD_ALLCAPS_NAME" },
+		{ "code" : "METHOD_IS_TEMPORARY" },
+		{ "code": "NESTED_CFOUTPUT" },
+		{ "code": "NEVER_USE_QUERY_IN_CFM" },
+		{ "code": "OUTPUT_ATTR" },
+		{ "code" : "QUERYPARAM_REQ" },
+        { "code": "UNUSED_LOCAL_VARIABLE" },
+        { "code": "UNUSED_METHOD_ARGUMENT" },
+		{ "code": "SQL_SELECT_STAR" },
+		{ "code": "SCOPE_ALLCAPS_NAME" },
+		{ "code": "VAR_ALLCAPS_NAME" },
+		{ "code": "VAR_INVALID_NAME" },
+		{ "code": "VAR_TOO_WORDY" },
+		{ "code": "VAR_IS_TEMPORARY" }
+    ],
+    "inheritParent": false,
+    "inheritPlugins": true,
+    "parameters": {
+		"TooManyFunctionsChecker.maximum" : 20
+	}
+}

.editorconfig

@@ -0,0 +1,20 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = false
+indent_style = tab
+indent_size = 4
+tab_width = 4
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.{md,markdown}]
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitignore

@@ -9,6 +9,7 @@ settings.xml
 web.config
 "Icon\r"
 WEB-INF/**
+.vscode/*
 
 # Build Dependencies
 artifacts/**
@@ -35,10 +36,12 @@ config/runtime.properties.cfm
 # Module Dependencies
 modules/contentbox/themes/default/bower_components
 modules/contentbox/themes/default/node_modules
+modules/route-visualizer/**
 
 # ContentBox Dependency Modules
 modules/contentbox/modules/contentbox-deps/modules/*
 
 # Testing
 /tests/**/logs/**
-/tests/test-results/*
+/tests/test-results/*
+tests/resources/patches/tmp/

.jsbeautifyrc

@@ -0,0 +1,45 @@
+{
+    "beautify.language": {
+        "js": {
+            "type": ["javascript", "json"],
+            "filename": [".jshintrc", ".jsbeautifyrc"]
+        },
+        "css": ["css", "scss"],
+        "html": ["htm", "html", "cfml", "cfm"]
+    },
+    "brace_style": "collapse",
+    "indent_with_tabs": true,
+    "indent_size": 4,
+    "indent_level": 0,
+    "preserve_newlines": true,
+    "max_preserve_newlines": 5,
+    "html": {
+        "allowed_file_extensions": ["htm", "html", "xhtml", "shtml", "xml", "svg", "cfm", "cfml"],
+        "indent_scripts": "keep",
+        "indent_inner_html": true,
+        "indent_body_inner_html": true,
+        "indent_handlebars": true,
+        "unformatted": ["code", "pre"],
+        "content_unformatted": ["pre", "code"],
+        "wrap_line_length": 0
+    },
+    "css": {
+        "selector_separator_newline": true
+    },
+    "js": {
+        "break_chained_methods": true,
+        "comma_first": false,
+        "e4x": false,
+        "jslint_happy": true,
+        "keep_function_indentation": true,
+        "keep_array_indentation": true,
+        "space_after_anon_function": false,
+        "spaceBeforeConditional": true,
+        "space_in_paren": true,
+        "space_in_empty_paren": false,
+        "space_before_conditional": true,
+        "operator_position": "before-newline",
+        "unescape_strings": false,
+        "wrap_line_length": 0
+    }
+}

.jshintrc

@@ -1,14 +1,19 @@
 {
-	"curly" 	: true,
-	"eqeqeq"  	: true,
-	"eqnull" 	: true,
-	"browser" 	: true,
-	"devel" 	: true,
-	"sub"		: true,
-	"globals" 	: {
-		"jQuery" 	: true,
-		"$" 		: true,
-		"module" 	: true,
-		"angular" 	: true
-	}
+    "bitwise": true,
+    "curly": true,
+    "eqeqeq": true,
+    "eqnull": true,
+    "browser": true,
+    "devel": true,
+    "sub": true,
+    "noarg": true,
+    "node": true,
+    "unused": true,
+    "esversion": 6,
+    "globals": {
+        "jQuery": true,
+        "$": true,
+        "module": true,
+        "angular": true
+    }
 }

.travis.yml

@@ -20,10 +20,10 @@ git:
 env:
   matrix:
     - [email protected]
-    #- ENGINE=lucee@5 Activate once patch is released, works on snapshot only right now.
+    - ENGINE=lucee@5
     - ENGINE=adobe@11
     - ENGINE=adobe@2016
-  
+
 addons:
   apt:
     packages:
@@ -59,11 +59,11 @@ before_script:
 script:
   # Run tests
   - box package set testbox.runner="http://localhost:8589/tests/runner.cfm"
-  - box testbox run
+  - box testbox run verbose=true
   # Execute build via ANT
   - ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -Dbuild.branch=$TRAVIS_BRANCH -f build/build.xml
   # Get ContentBox Version for rest of build process
-  - PROJECT_VERSION="$(cat build/build-contentbox/module/box.json | jq -r '.version')"
+  - PROJECT_VERSION="$(cat build/build-contentbox/version.json | jq -r '.version')"
   # Spit out debugging info
   - cat build/build-contentbox/module/box.json
 
@@ -77,7 +77,7 @@ deploy:
   # Upload binaries
   - provider: s3
     on:
-      branch: 
+      branch:
         - development
         - master
       condition: "$ENGINE = [email protected]"
@@ -88,11 +88,11 @@ deploy:
     local-dir: artifacts
     upload-dir: ortussolutions
     acl: public_read
-  
+
   # Upload api docs
   - provider: s3
     on:
-      branch: 
+      branch:
         - development
         - master
       condition: "$ENGINE = [email protected]"
@@ -105,5 +105,5 @@ deploy:
     acl: public_read
 
 # Now publish assets to ForgeBox
-after_success:
-  - build/forgebox-publish.sh
+after_deploy:
+  - if [ ${ENGINE} = '[email protected]' ]; then box forgebox publish; fi

Application.cfc

@@ -72,7 +72,7 @@ component{
 
 	// Local ORM SQL Logging
 	if( reFindNoCase( "^(dev\.|localhost|127\.0\.0)", cgi.http_host )  ){
-		this.ormSettings.logSQL = false;
+		this.ormSettings.logSQL = true;
 	}
 
 	/************************************** METHODS *********************************************/

box-site.json

@@ -27,15 +27,15 @@
         "Curt Gratz <[email protected]>"
     ],
     "dependencies":{
-        "coldbox":"^4.3.0",
+        "coldbox":"^5.0.0",
         "contentbox":"^@version.number@[email protected]@"
     },
     "installPaths":{
         "coldbox":"coldbox",
         "testbox":"testbox"
     },
     "devDependencies":{
-        "testbox":"^2.5.0"
+        "testbox":"^2.6.0"
     },
     "ignores":[
     ]

box.json

@@ -23,16 +23,13 @@
         "Curt Gratz <[email protected]>"
     ],
     "dependencies":{
-        "coldbox":"^4.3.0"
+        "coldbox":"^5.0.0",
+        "testbox":"be"
     },
     "installPaths":{
         "coldbox":"coldbox",
         "testbox":"testbox"
     },
-    "devDependencies":{
-        "testbox":"^2.5.0+107"
-    },
-    "ignores":[
-
-    ]
+    "devDependencies":{},
+    "ignores":[]
 }

build/build.properties

@@ -1,6 +1,6 @@
 # Versions
-contentbox.version=3.7.1
-contentbox.stableversion=3.7.0
+contentbox.version=4.0.0
+contentbox.stableversion=3.7.1
 
 #locations
 dir.exports=${basedir}/artifacts
@@ -23,16 +23,16 @@ box.repo.url=http://downloads.ortussolutions.com
 dir.resources=${basedir}/build/resources
 dir.dependencies=${basedir}/build/dependencies
 # Lucee stable for WAR edition
-lucee.version=4.5.5.006
+lucee.version=5.2.6.60
 # Lucee patching levels if needed
 lucee.patch=
 tuckey.version=4.0.3
 # Embedded Tomcat Version for express edition
-express.server.version=8.5.13
+express.server.version=8.5.24
 # For local execution of git commands
 git.executable=/usr/bin/git
 # For Express Embedded version
-jre.version=1.8.0_131
+jre.version=1.8.0_144
 
 #bleeding edge info
 be.exports=${dir.exports}/${contentbox.slug}