Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 2f2c54a
Merge: 9d6644e 19bfa49
Author: Denard Springle <denard.s@3dgeeksolutions.com>
Date:   Sat Jun 1 01:41:09 2024 -0400

    Merge pull request #547 from framework-one/498-modify-request-level-handling-via-subsystem-configuration

    added request.params and subsystem config awareness

commit 19bfa49
Merge: 3687995 a3325a7
Author: Kevin J. Miller <kevinm@edgeinformation.com>
Date:   Fri May 31 23:58:43 2024 -0400

    Merge branch '498-modify-request-level-handling-via-subsystem-configuration' of https://github.com/framework-one/fw1 into 498-modify-request-level-handling-via-subsystem-configuration

commit 3687995
Author: Kevin J. Miller <kevinm@edgeinformation.com>
Date:   Fri May 31 23:57:45 2024 -0400

    removed SES related configs from subsystem awareness

commit 9d6644e
Author: Denard Springle <denard.s@3dgeeksolutions.com>
Date:   Mon May 27 23:50:23 2024 -0400

    Add new 5.0.0 branch to test case

commit a3325a7
Author: Denard Springle <denard.springle@gmail.com>
Date:   Mon May 27 23:04:36 2024 -0400

    Update version

    Update the version for release of subsystem overrides

commit 6f3a3d0
Author: Kevin J. Miller <kevinm@edgeinformation.com>
Date:   Mon May 27 21:49:00 2024 -0400

    added request.params and subsystem config awareness
  • Loading branch information
ddspringle committed Jun 4, 2024
1 parent 091161e commit cfaefba
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 83 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/fw1_java11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: fw1 Java 11

on:
push:
branches: [ "develop" ]
branches: [ "develop", "5.0.0" ]
pull_request:
branches: [ "develop" ]
branches: [ "develop", "5.0.0" ]

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion framework/aop.cfc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component extends="framework.ioc" {
variables._fw1_version = "4.3.0";
variables._fw1_version = "4.3.2";
variables._aop1_version = variables._fw1_version;
/*
Copyright (c) 2013-2018, Mark Drew, Sean Corfield, Daniel Budde
Expand Down
2 changes: 1 addition & 1 deletion framework/ioc.cfc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
component {
variables._fw1_version = "4.3.0";
variables._fw1_version = "4.3.2";
variables._di1_version = variables._fw1_version;
/*
Copyright (c) 2010-2018, Sean Corfield
Expand Down
Loading

0 comments on commit cfaefba

Please sign in to comment.