Merge branch 'development'

coldbox-modules · Oct 10, 2022 · f87e4bc · f87e4bc
2 parents 5b8fc02 + 5f9fe11
commit f87e4bc
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 55 deletions.
diff --git a/.cfconfig.json b/.cfconfig.json
@@ -16,12 +16,12 @@
 			"validate":"false"
         }
 	},
-	"adminPassword":"commandbox",
+	"adminPassword":"coldbox",
 	"debuggingEnabled":true,
 	"whitespaceManagement":"white-space-pref",
     "debuggingReportExecutionTimes":false,
     "disableInternalCFJavaComponents":false,
     "inspectTemplate":"always",
     "requestTimeout":"0,0,0,90",
     "robustExceptionEnabled":true
-}
+}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -5,7 +5,7 @@ on:
   workflow_call:
     secrets:
       SLACK_WEBHOOK_URL:
-        required: true
+        required: false
 
 jobs:
   tests:
@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ]
+        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
         experimental: [false]
         include:
           - cfengine: "[email protected]"

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -5,10 +5,15 @@
 			"directoryPath": "./test-harness/coldbox",
 			"isPhysicalDirectoryPath": false
 		},
+		{
+			"logicalPath": "/testbox",
+			"directoryPath": "./test-harness/testbox",
+			"isPhysicalDirectoryPath": false
+		},
 		{
 			"logicalPath": "/cborm",
 			"directoryPath": "./",
 			"isPhysicalDirectoryPath": false
 		}
 	]
-}
+}
diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox ORM Extensions",
-    "version":"3.9.0",
+    "version":"4.0.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cborm/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions <[email protected]",
     "homepage":"https://github.com/coldbox-modules/cborm",
@@ -26,9 +26,9 @@
         "Joel Watson <[email protected]>"
     ],
     "dependencies":{
-        "cbvalidation":"^3.0.0",
-        "mementifier":"^2.0.0",
-        "cbstreams":"^1.5.0",
+        "cbvalidation":"^4.0.0",
+        "mementifier":"^3.0.0",
+        "cbstreams":"^2.0.0",
         "cbpaginator":"^2.0.0"
     },
     "devDependencies":{

diff --git a/build/.travis.yml b/build/.travis.yml
@@ -10,7 +10,6 @@ env:
     - MODULE_ID=cborm
   matrix:
     - ENGINE=lucee@5
-    - ENGINE=adobe@2016
     - ENGINE=adobe@2018
 
 branches:

diff --git a/changelog.md b/changelog.md
@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ----
 
+## [v4.0.0] => 2022-OCT-10
+
+### Added
+
+* Upgraded all dependencies to major bumps
+
+### Changed
+
+* Dropped ACF2016 Support
+
+----
+
 ## [v3.9.0] => 2022-AUG-10
 
 ### Added

diff --git a/readme.md b/readme.md
@@ -86,8 +86,6 @@ Apache License, Version 2.0.
 * Lucee 5+
   * Hibernate 3.5.x
   * Hibernate 5.x via the new hibernate extension
-* ColdFusion 2016 (DEPRECATED)
-  * Hibernate 4.3.10
 * ColdFusion 2018
   * Hibernate 5.2.11
 * ColdFusion 2021

diff --git a/[email protected] b/[email protected]
diff --git a/test-harness/box.json b/test-harness/box.json
@@ -5,10 +5,10 @@
     "private":true,
     "description":"",
     "dependencies":{
-        "cbvalidation":"^3.0.0",
-        "mementifier":"^2.0.0",
-        "cbstreams":"^1.4.0+48",
-        "coldbox":"6",
+        "cbvalidation":"^4.0.0",
+        "mementifier":"^3.0.0",
+        "cbstreams":"^2.0.0",
+        "coldbox":"^6",
         "cbpaginator":"^2.0.0"
     },
     "devDependencies":{

diff --git a/test-harness/tests/specs/util/CFORMUtilTest.cfc b/test-harness/tests/specs/util/CFORMUtilTest.cfc
@@ -63,8 +63,6 @@ component extends="tests.resources.BaseTest" skip="isLucee" {
 		// Fragile test: These will need updating if (and only if) the engines upgrade the installed Hibernate version
 		if ( listFirst( server.coldfusion.productVersion ) == 2018 ) {
 			assertEquals( "5.2.11.SNAPSHOT", ormutil.getHibernateVersion() );
-		} else if ( listFirst( server.coldfusion.productVersion ) == 2016 ) {
-			assertEquals( "4.3.10.Final", ormutil.getHibernateVersion() );
 		}
 	}
 

diff --git a/test-harness/tests/specs/util/ORMUtilFactoryTest.cfc b/test-harness/tests/specs/util/ORMUtilFactoryTest.cfc
@@ -29,17 +29,6 @@ component extends="testbox.system.BaseSpec" {
 				skip = isLucee
 			);
 
-			it(
-				title = "can get lucee > 4.3 instance",
-				body  = function(){
-					factory.$( "getPlatform", "lucee" ).$( "getLuceeVersion", "4.3.000" );
-					var u = factory.getORMUtil();
-					expect( u ).toBeInstanceOf( "cborm.models.util.LuceeORMUtil" );
-				},
-				skip = function(){
-					return ( isLucee() and findNoCase( "4.3", server.lucee.version ) ) ? false : true;
-				}
-			);
 		} );
 	}