Merge branch 'master' into development

Author: lmajano

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
+        cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2023", "adobe@2025" ]
         coldboxVersion: [ "^7.0.0" ]
         experimental: [ false ]
         # Experimental: ColdBox BE vs All Engines
@@ -30,13 +30,13 @@ jobs:
             cfengine: "lucee@6"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "adobe@2021"
+            cfengine: "adobe@2023"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "adobe@2023"
+            cfengine: "adobe@2025"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "boxlang-cfml@1"
+            cfengine: "boxlang-cfml@be"
             experimental: true
     steps:
       - name: Checkout Repository

changelog.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added 2025 tests
+- Added BoxLang BE tests
+- Added stupid Adobe argument collection JVM argument collection fix
+- Updated build processes
+
 ## [3.6.1] - 2025-04-06
 
 ## [3.6.0] - 2025-02-19

server-adobe@2021.json

@@ -15,6 +15,11 @@
         "aliases":{
             "/moduleroot/mementifier":"../"
         }
+    },
+	"JVM":{
+		"heapSize":"768",
+		"javaVersion":"openjdk11_jre",
+        "args":"-Dcoldfusion.runtime.remotemethod.matchArguments=false"
     },
     "openBrowser":"false",
 	"cfconfig":{

server-adobe@2023.json

@@ -16,8 +16,10 @@
             "/moduleroot/mementifier":"../"
         }
     },
-    "jvm":{
-        "heapSize":"1024"
+    "JVM":{
+		"heapSize":"768",
+		"javaVersion":"openjdk21_jre",
+        "args":"-Dcoldfusion.runtime.remotemethod.matchArguments=false"
     },
     "openBrowser":"false",
 	"cfconfig": {

server-adobe@2025.json

@@ -0,0 +1,30 @@
+{
+    "name":"mementifier-adobe@2025",
+    "app":{
+        "serverHomeDirectory":".engine/adobe2025",
+        "cfengine":"adobe@2025"
+    },
+    "web":{
+        "http":{
+            "port":"60299"
+        },
+        "rewrites":{
+            "enable":"true"
+        },
+		"webroot": "test-harness",
+		"aliases":{
+            "/moduleroot/mementifier":"../"
+        }
+    },
+    "JVM":{
+		"javaVersion":"openjdk21_jre",
+        "args":"-Dcoldfusion.runtime.remotemethod.matchArguments=false"
+    },
+    "openBrowser":"false",
+	"cfconfig": {
+		"file" : ".cfconfig.json"
+	},
+    "scripts" : {
+        "onServerInstall":"cfpm install zip,debugger,orm,mysql,postgresql,sqlserver,feed,chart"
+    }
+}

server-boxlang-cfml@1.json

@@ -1,9 +1,9 @@
 {
     "app":{
-        "cfengine":"boxlang@be",
-        "serverHomeDirectory":".engine/boxlang"
+        "cfengine":"boxlang@1",
+        "serverHomeDirectory":".engine/boxlang-cfml-1"
     },
-    "name":"mementifier-boxlang@1",
+    "name":"mementifier-boxlang-cfml@1",
     "force":true,
     "openBrowser":false,
     "web":{
@@ -20,7 +20,7 @@
         }
     },
     "JVM":{
-        "heapSize":"1024",
+        "heapSize":"768",
         "javaVersion":"openjdk21_jre",
         "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888 -Dboxlang.debugMode=true"
     },

server-boxlang-cfml@be.json

@@ -0,0 +1,36 @@
+{
+    "app":{
+        "cfengine":"boxlang@be",
+        "serverHomeDirectory":".engine/boxlang-cfml-be"
+    },
+    "name":"mementifier-boxlang-cfml@be",
+    "force":true,
+    "openBrowser":false,
+    "web":{
+        "directoryBrowsing":true,
+        "http":{
+            "port":"60299"
+        },
+        "rewrites":{
+            "enable":"true"
+        },
+        "webroot":"test-harness",
+        "aliases":{
+            "/moduleroot/mementifier":"./"
+        }
+    },
+    "JVM":{
+        "heapSize":"768",
+        "javaVersion":"openjdk21_jre",
+        "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888 -Dboxlang.debugMode=true"
+    },
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "env":{
+        "BOXLANG_DEBUG":true
+    },
+    "scripts":{
+        "onServerInitialInstall":"install bx-compat-cfml,bx-orm,bx-mysql,bx-esapi --noSave"
+    }
+}