chore(box.json): Update dependencies

Update to cbstorages 3.0.0 and drop support for ACF 2016. BREAKING CHANGE: Drop support for ACF 2016.
coldbox-modules · Oct 14, 2022 · 299099c · 299099c
1 parent f717586
commit 299099c
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 74 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        cfengine: ["lucee@5", "lucee@be", "adobe@2016", "adobe@2018", "adobe@be"]
+        cfengine: ["lucee@5", "lucee@be", "adobe@2018", "adobe@2021", "adobe@be"]
         javaVersion: ["openjdk8", "openjdk11"]
     steps:
       - name: Checkout Repository
@@ -20,17 +20,22 @@ jobs:
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install dependencies
         run: |
           box install
-      
+
       - name: Start server
-        run: box server start cfengine=${{ matrix.cfengine }} javaVersion=${{ matrix.javaVersion }} --noSaveSettings
+        run: |
+          box server start cfengine=${{ matrix.cfengine }} javaVersion=${{ matrix.javaVersion }} --noSaveSettings
+          # Install Adobe 2021 cfpm modules
+          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            box run-script install:2021
+          fi
 
       - name: Run TestBox Tests
-        run: box testbox run
+        run: box testbox run
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -19,25 +19,30 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
+        cfengine: ["lucee@5", "adobe@2018", "adobe@2021" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install dependencies
         run: |
           box install
-      
+
       - name: Start server
-        run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+        run: |
+          box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+          # Install Adobe 2021 cfpm modules
+          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            box run-script install:2021
+          fi
 
       - name: Run TestBox Tests
         run: box testbox run
@@ -52,18 +57,18 @@ jobs:
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install CFFormat
         run: box install commandbox-cfformat
-      
+
       - name: Run CFFormat
         run: box run-script format
 
       - name: Commit Format Changes
         uses: stefanzweifel/git-auto-commit-action@v4
         with:
-          commit_message: Apply cfformat changes
+          commit_message: Apply cfformat changes
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
@@ -13,57 +13,30 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
+        cfengine: ["lucee@5", "adobe@2018", "adobe@2021" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install dependencies
         run: |
           box install
-      
+
       - name: Start server
-        run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+        run: |
+          box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+          # Install Adobe 2021 cfpm modules
+          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            box run-script install:2021
+          fi
 
       - name: Run TestBox Tests
         run: box testbox run
-
-  # release:
-  #   name: Semantic Release
-  #   if: "!contains(github.event.head_commit.message, '__SEMANTIC RELEASE VERSION UPDATE__')"
-  #   needs: tests
-  #   runs-on: ubuntu-latest
-  #   env:
-  #     GA_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
-  #   steps:
-      # - name: Checkout Repository
-      #   uses: actions/checkout@v2
-      #   with:
-      #     fetch-depth: 0
-
-  #     - name: Setup Java JDK
-  #       uses: actions/[email protected]
-  #       with:
-  #         java-version: 11 
-
-  #     - name: Set Up CommandBox
-  #       uses: elpete/[email protected]
-
-  #     - name: Install and Configure Semantic Release
-  #       run: |
-  #         box install commandbox-semantic-release
-  #         box config set endpoints.forgebox.APIToken=${{ secrets.FORGEBOX_TOKEN }}
-  #         box config set modules.commandbox-semantic-release.plugins='{ "VerifyConditions": "GitHubActionsConditionsVerifier@commandbox-semantic-release", "FetchLastRelease": "ForgeBoxReleaseFetcher@commandbox-semantic-release", "RetrieveCommits": "JGitCommitsRetriever@commandbox-semantic-release", "ParseCommit": "ConventionalChangelogParser@commandbox-semantic-release", "FilterCommits": "DefaultCommitFilterer@commandbox-semantic-release", "AnalyzeCommits": "DefaultCommitAnalyzer@commandbox-semantic-release", "VerifyRelease": "NullReleaseVerifier@commandbox-semantic-release", "GenerateNotes": "GitHubMarkdownNotesGenerator@commandbox-semantic-release", "UpdateChangelog": "FileAppendChangelogUpdater@commandbox-semantic-release", "CommitArtifacts": "NullArtifactsCommitter@commandbox-semantic-release", "PublishRelease": "ForgeBoxReleasePublisher@commandbox-semantic-release", "PublicizeRelease": "GitHubReleasePublicizer@commandbox-semantic-release" }'
-
-      # - name: Run Semantic Release
-      #   env:
-      #     GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      #   run: box semantic-release --prerelease
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,25 +14,30 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
+        cfengine: ["lucee@5", "adobe@2018", "adobe@2021" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install dependencies
         run: |
           box install
-      
+
       - name: Start server
-        run: box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+        run: |
+          box server start cfengine=${{ matrix.cfengine }} --noSaveSettings
+          # Install Adobe 2021 cfpm modules
+          if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            box run-script install:2021
+          fi
 
       - name: Run TestBox Tests
         run: box testbox run
@@ -53,19 +58,19 @@ jobs:
       - name: Setup Java JDK
         uses: actions/[email protected]
         with:
-          java-version: 11 
+          java-version: 11
 
       - name: Set Up CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
-      
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
+
       - name: Install and Configure Semantic Release
         run: |
           box install commandbox-semantic-release
           box config set endpoints.forgebox.APIToken=${{ secrets.FORGEBOX_TOKEN }}
           box config set modules.commandbox-semantic-release.targetBranch=main
           box config set modules.commandbox-semantic-release.plugins='{ "VerifyConditions": "GitHubActionsConditionsVerifier@commandbox-semantic-release", "FetchLastRelease": "ForgeBoxReleaseFetcher@commandbox-semantic-release", "RetrieveCommits": "JGitCommitsRetriever@commandbox-semantic-release", "ParseCommit": "ConventionalChangelogParser@commandbox-semantic-release", "FilterCommits": "DefaultCommitFilterer@commandbox-semantic-release", "AnalyzeCommits": "DefaultCommitAnalyzer@commandbox-semantic-release", "VerifyRelease": "NullReleaseVerifier@commandbox-semantic-release", "GenerateNotes": "GitHubMarkdownNotesGenerator@commandbox-semantic-release", "UpdateChangelog": "FileAppendChangelogUpdater@commandbox-semantic-release", "CommitArtifacts": "NullArtifactsCommitter@commandbox-semantic-release", "PublishRelease": "ForgeBoxReleasePublisher@commandbox-semantic-release", "PublicizeRelease": "GitHubReleasePublicizer@commandbox-semantic-release" }'
-      
+
       - name: Run Semantic Release
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: box semantic-release
+        run: box semantic-release
diff --git a/README.md b/README.md
@@ -2,10 +2,10 @@
 
 Authentication services for ColdBox Applications.
 
-## Requirements 
+## Requirements
 
 - Lucee 5+
-- Adobe ColdFusion 2016+
+- Adobe ColdFusion 2018+
 
 ## Installation
 

diff --git a/box.json b/box.json
@@ -26,10 +26,10 @@
         }
     ],
     "dependencies":{
-        "cbstorages":"^2.0.0"
+        "cbstorages":"^3.0.0"
     },
     "devDependencies":{
-        "testbox":"^3.0.0"
+        "testbox":"^4"
     },
     "installPaths":{
         "testbox":"testbox/",
@@ -38,7 +38,8 @@
     "scripts":{
         "format":"cfformat run models/**/*.cfc,tests/specs/**/*.cfc --overwrite",
         "format:check":"cfformat check models/**/*.cfc,tests/specs/**/*.cfc --verbose",
-        "generateAPIDocs":"rm .tmp --recurse --force && docbox generate mapping=cbauth excludes=tests|ModuleConfig strategy-outputDir=.tmp/apidocs strategy-projectTitle=cbauth"
+        "generateAPIDocs":"rm .tmp --recurse --force && docbox generate mapping=cbauth excludes=tests|ModuleConfig strategy-outputDir=.tmp/apidocs strategy-projectTitle=cbauth",
+        "install:2021":"cfpm install zip,debugger"
     },
     "ignore":[
         "**/.*",

diff --git a/server.json b/server.json
@@ -1,10 +1,11 @@
 {
+	"name":"cbauth",
     "app":{
-        "cfengine":"adobe@2016"
+        "cfengine":"adobe@2018"
     },
     "web":{
         "http":{
             "port":"61200"
         }
     }
-}
+}