From a286d5704b1582bf25b3dfb6524b37d1f5b13494 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Wed, 10 Jan 2024 11:43:23 +0000 Subject: [PATCH 1/4] Version bump --- box.json | 8 ++++---- changelog.md | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/box.json b/box.json index 4c17f19..12c38f8 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"ColdBox Security", - "version":"3.4.2", + "version":"3.5.0", "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/cbsecurity-@build.version@.zip", "author":"Ortus Solutions.com ", "slug":"cbsecurity", @@ -52,15 +52,15 @@ "start:lucee":"server start serverConfigFile=server-lucee@5.json", "start:2018":"server start serverConfigFile=server-adobe@2018.json", "start:2021":"server start serverConfigFile=server-adobe@2021.json", - "start:2023":"server start serverConfigFile=server-adobe@2023.json", + "start:2023":"server start serverConfigFile=server-adobe@2023.json", "stop:lucee":"server stop serverConfigFile=server-lucee@5.json", "stop:2018":"server stop serverConfigFile=server-adobe@2018.json", "stop:2021":"server stop serverConfigFile=server-adobe@2021.json", - "stop:2023":"server stop serverConfigFile=server-adobe@2023.json", + "stop:2023":"server stop serverConfigFile=server-adobe@2023.json", "logs:lucee":"server log serverConfigFile=server-lucee@5.json --follow", "logs:2018":"server log serverConfigFile=server-adobe@2018.json --follow", "logs:2021":"server log serverConfigFile=server-adobe@2021.json --follow", - "logs:2023":"server log serverConfigFile=server-adobe@2023.json --follow" + "logs:2023":"server log serverConfigFile=server-adobe@2023.json --follow" }, "installPaths":{ "jwt-cfml":"modules/jwtcfml/", diff --git a/changelog.md b/changelog.md index e342005..23d4198 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [3.4.2] - 2024-01-10 + +## [3.4.1] - 2023-08-09 + ### Fixed - Markdown rules updated to fix duplicate headers @@ -371,7 +375,9 @@ settings = { - Created first module version -[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.1...HEAD +[Unreleased]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.2...HEAD + +[3.4.2]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.1...v3.4.2 [3.4.1]: https://github.com/coldbox-modules/cbsecurity/compare/v3.4.0...v3.4.1 From 7b552d99f18b3fed7a13836529d848fd6cbdafa9 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 9 May 2024 15:45:35 +0200 Subject: [PATCH 2/4] - Renamed `renderView()` to `view` to be ColdBox 7 compliant now. --- box.json | 2 +- changelog.md | 4 ++++ layouts/Main.cfm | 2 +- test-harness/layouts/Main.cfm | 4 ++-- views/home/index.cfm | 16 ++++++++-------- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/box.json b/box.json index 12c38f8..f9c3754 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"ColdBox Security", - "version":"3.5.0", + "version":"3.4.3", "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbsecurity/@build.version@/cbsecurity-@build.version@.zip", "author":"Ortus Solutions.com ", "slug":"cbsecurity", diff --git a/changelog.md b/changelog.md index 23d4198..47a5091 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Fixed + +- Renamed `renderView()` to `view` to be ColdBox 7 compliant now. + ## [3.4.2] - 2024-01-10 ## [3.4.1] - 2023-08-09 diff --git a/layouts/Main.cfm b/layouts/Main.cfm index 3d0df80..3c84a0d 100644 --- a/layouts/Main.cfm +++ b/layouts/Main.cfm @@ -76,7 +76,7 @@
- #renderView()# + #view()#
diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm index f8894ef..b50f9ab 100644 --- a/test-harness/layouts/Main.cfm +++ b/test-harness/layouts/Main.cfm @@ -1,6 +1,6 @@ 

Module Tester

- #renderView()# + #view()#
- \ No newline at end of file + diff --git a/views/home/index.cfm b/views/home/index.cfm index 9046c8e..5537c42 100644 --- a/views/home/index.cfm +++ b/views/home/index.cfm @@ -137,49 +137,49 @@
- #renderView( + #view( view = "home/tabs/activity", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/authentication", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/basicAuth", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/csrf", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/firewall", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/rules", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/jwt", module = "cbsecurity" )#
- #renderView( + #view( view = "home/tabs/security-headers", module = "cbsecurity" )# From 7cd464c8966a9860c26831c34147eef59cd6ef80 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 9 May 2024 15:50:21 +0200 Subject: [PATCH 3/4] fix adobe engine --- server-adobe@2023.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server-adobe@2023.json b/server-adobe@2023.json index 06dab69..2efce97 100644 --- a/server-adobe@2023.json +++ b/server-adobe@2023.json @@ -2,7 +2,7 @@ "name":"cbsecurity-adobe@2023", "app":{ "serverHomeDirectory":".engine/adobe2023", - "cfengine":"adobe@2023.0.0-beta.1" + "cfengine":"adobe@2023" }, "web":{ "http":{ From c9ce62612983bc98526f4f5d2326784bf528a1df Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Thu, 9 May 2024 15:55:22 +0200 Subject: [PATCH 4/4] fixing apidocs build --- build/Build.cfc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/Build.cfc b/build/Build.cfc index ee9366e..b15a671 100644 --- a/build/Build.cfc +++ b/build/Build.cfc @@ -12,6 +12,7 @@ component { variables.cwd = getCWD().reReplace( "\.$", "" ); variables.artifactsDir = cwd & "/.artifacts"; variables.buildDir = cwd & "/.tmp"; + variables.apidDocsDir = variables.buildDir & "/apidocs"; variables.apiDocsURL = "http://localhost:60299/apidocs/"; variables.testRunner = "http://localhost:60299/tests/runner.cfm"; @@ -31,7 +32,8 @@ component { // Cleanup + Init Build Directories [ variables.buildDir, - variables.artifactsDir + variables.artifactsDir, + variables.apidDocsDir ].each( function( item ){ if ( directoryExists( item ) ) { directoryDelete( item, true );