v5.1.0 Release

Ortus-Solutions · Mar 17, 2022 · f037ef8 · f037ef8
2 parents dcd6594 + a68fded
commit f037ef8
Show file tree

Hide file tree

Showing 395 changed files with 3,511 additions and 6,244 deletions.
diff --git a/.cfformat.json b/.cfformat.json
@@ -8,6 +8,7 @@
 	"alignment.consecutive.assignments": true,
 	"alignment.consecutive.properties": false,
 	"alignment.consecutive.params": true,
+	"alignment.doc_comments" : true,
 	"brackets.padding": true,
 	"comment.asterisks": "align",
 	"binary_operators.padding": true,
@@ -41,7 +42,7 @@
 	"keywords.spacing_to_block": "spaced",
 	"keywords.spacing_to_group": true,
 	"keywords.empty_group_spacing": false,
-	"max_columns": 100,
+	"max_columns": 120,
 	"metadata.multiline.element_count": 3,
 	"metadata.multiline.min_length": 50,
 	"method_call.chain.multiline" : 3,
@@ -59,4 +60,4 @@
 	"struct.multiline.element_count": 2,
 	"struct.multiline.min_length": 60,
 	"tab_indent": true
-}
+}
diff --git a/.github/FUNDING.YML b/.github/FUNDING.YML
@@ -0,0 +1 @@
+patreon: ortussolutions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,15 +20,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018" ]
+        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ]
         javaVersion: [ "openjdk8", "openjdk11" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
       - name: Setup Database and Fixtures
         run: |
-          sudo /etc/init.d/mysql start
+          sudo systemctl start mysql.service
           mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE contentbox;'
           mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < tests/resources/sql/mysql/contentbox.sql
 
@@ -38,12 +38,13 @@ jobs:
           distribution: "adopt"
           java-version: "11"
 
-      - name: Setup CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
+      - name: Setup CommandBox CLI
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
 
       - name: Setup .env For Runner
         run: |
           touch .env
+          printf "ENVIRONMENT=development\n" >> .env
           printf "DB_HOST=127.0.0.1\n" >> .env
           printf "DB_DATABASE=contentbox\n" >> .env
           printf "DB_DRIVER=MySQL\n" >> .env
@@ -105,7 +106,7 @@ jobs:
 
       - name: Run Swagger Tests
         run: |
-          curl http://127.0.0.1:8589/index.cfm/cbswagger?debugmode=false&debugpassword=cb > tests/results/contentbox-swagger.json
+          curl "http://127.0.0.1:8589/index.cfm/cbswagger?debugmode=false&debugpassword=cb" -o "tests/results/contentbox-swagger.json"
 
       - name: Publish Test Results
         uses: EnricoMi/publish-unit-test-result-action@v1
@@ -126,7 +127,7 @@ jobs:
         if: failure()
         uses: rtCamp/action-slack-notify@v2
         env:
-          SLACK_CHANNEL: contentbox
+          SLACK_CHANNEL: coding
           SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
           SLACK_ICON_EMOJI: ":bell:"
           SLACK_MESSAGE: 'ContentBox tests failed :cry:, check them out here: https://github.com/Ortus-Solutions/ContentBox/actions'
@@ -143,6 +144,9 @@ jobs:
           if [[ "{{ matrix.cfengine }}" == "adobe@2018" ]] ; then
             cat .engines/acf2018/WEB-INF/cfusion/logs/hibernatesql.log
           fi
+          if [[ "{{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            cat .engines/acf2021/WEB-INF/cfusion/logs/hibernatesql.log
+          fi
           box server log serverConfigFile="server-${{ matrix.cfengine }}.json"
 
       - name: Upload Debugging Info To Artifacts
@@ -173,24 +177,16 @@ jobs:
           distribution: "adopt"
           java-version: "11"
 
-      - name: Cache CommandBox Dependencies
-        uses: actions/cache@v1
-        if: ${{ true }}
-        with:
-          path: ~/.CommandBox/artifacts
-          key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'modules/contentbox/box.json' ) }}
-          restore-keys: |
-            ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'modules/contentbox/box.json' ) }}
-
-      - name: Setup CommandBox
-        uses: elpete/[email protected]
+      - name: Setup CommandBox CLI
+        uses: Ortus-Solutions/[email protected]
         with:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_API_TOKEN }}
 
       - name: Install Build Dependencies
         run: |
           box install --production
           box install commandbox-docbox
+          cd modules/contentbox && box install --production
 
       - name: Setup Environment Variables For Build Process
         id: current_version
@@ -211,7 +207,8 @@ jobs:
       - name: Build Docs
         run: |
           # Normalize swagger doc results
-          cp tests/results/contentbox-test-results-lucee@5/contentbox-swagger.json tests/results/
+          cp -v tests/results/contentbox-test-results-lucee@5/contentbox-swagger.json tests/results/
+          #ls -lR tests/results
           # Run Docs Build
           box run-script build:allDocs
 
@@ -266,10 +263,10 @@ jobs:
         if: ${{ always() }}
         uses: rtCamp/action-slack-notify@v2
         env:
-          SLACK_CHANNEL: contentbox
+          SLACK_CHANNEL: coding
           SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
           SLACK_ICON_EMOJI: ":bell:"
           SLACK_MESSAGE: 'ContentBox Built with ${{ job.status }}!'
           SLACK_TITLE: "ContentBox Build"
           SLACK_USERNAME: CI
-          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
diff --git a/.github/workflows/gh-release.yml b/.github/workflows/gh-release.yml
@@ -0,0 +1,19 @@
+# Publish Github Release
+name: Github Release
+
+on:
+  push:
+    tags:
+      - v[0-9]+.*
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: taiki-e/[email protected]
+        with:
+          # Produced by the build/Build.cfc
+          changelog: changelog.md
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -20,14 +20,15 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        cfengine: ["lucee@5", "adobe@2016", "adobe@2018"]
+        cfengine: [ "lucee@5", "adobe@2016", "adobe@2018", "adobe@2021" ]
+        javaVersion: [ "openjdk8", "openjdk11" ]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
       - name: Setup Database and Fixtures
         run: |
-          sudo /etc/init.d/mysql start
+          sudo systemctl start mysql.service
           mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE contentbox;'
           mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < tests/resources/sql/mysql/contentbox.sql
 
@@ -37,12 +38,13 @@ jobs:
           distribution: "adopt"
           java-version: "11"
 
-      - name: Setup CommandBox
-        uses: elpete/setup-commandbox@v1.0.0
+      - name: Setup CommandBox CLI
+        uses: Ortus-Solutions/setup-commandbox@v2.0.1
 
       - name: Setup .env For Runner
         run: |
           touch .env
+          printf "ENVIRONMENT=development\n" >> .env
           printf "DB_HOST=127.0.0.1\n" >> .env
           printf "DB_DATABASE=contentbox\n" >> .env
           printf "DB_DRIVER=MySQL\n" >> .env
@@ -52,27 +54,16 @@ jobs:
           printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
           printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
 
-      - name: Add Hibernate Logging
-        if: "${{ matrix.cfengine != 'lucee@5' }}"
-        run: |
-          # Log4j Hibernate Debug
-          mkdir -p .engines/acf2016/WEB-INF/cfusion/lib/
-          mkdir -p .engines/acf2018/WEB-INF/cfusion/lib/
-          mkdir -p .engines/acf2021/WEB-INF/cfusion/lib/
-          cp build/resources/log4j.properties .engines/acf2016/WEB-INF/cfusion/lib/
-          cp build/resources/log4j.properties .engines/acf2018/WEB-INF/cfusion/lib/
-          cp build/resources/log4j.properties .engines/acf2021/WEB-INF/cfusion/lib/
-
       - name: Install Dependencies
         run: |
           # Site dependencies
           box install
           # ContentBox dependencies
           cd modules/contentbox && box install
 
-      - name: Start ${{ matrix.cfengine }} Server
+      - name: Start ${{ matrix.cfengine }}/${{ matrix.javaVersion }} Server
         run: |
-          box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --debug
+          box server start serverConfigFile="server-${{ matrix.cfengine }}.json" javaVersion=${{ matrix.javaVersion }} --noSaveSettings --debug
           # Install Adobe 2021 cfpm modules
           if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
             box run-script install:2021
@@ -96,7 +87,7 @@ jobs:
         if: always()
         with:
           report_paths: 'tests/results/**/*.xml'
-          summary: true
+          check_name: "${{ matrix.cfengine }}/${{ matrix.javaVersion }} Test Results"
 
       - name: Failure debugging
         if: ${{ failure() }}
@@ -107,6 +98,9 @@ jobs:
           if [[ "{{ matrix.cfengine }}" == "adobe@2018" ]] ; then
             cat .engines/acf2018/WEB-INF/cfusion/logs/hibernatesql.log
           fi
+          if [[ "{{ matrix.cfengine }}" == "adobe@2021" ]] ; then
+            cat .engines/acf2021/WEB-INF/cfusion/logs/hibernatesql.log
+          fi
           box server log serverConfigFile="server-${{ matrix.cfengine }}.json"
 
   format:
@@ -116,22 +110,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v2
 
-      - name: Setup Java
-        uses: actions/setup-java@v2
+      - uses: Ortus-Solutions/[email protected]
         with:
-          distribution: "adopt"
-          java-version: "11"
-
-      - name: Set Up CommandBox
-        uses: elpete/[email protected]
-
-      - name: Install CFFormat
-        run: box install commandbox-cfformat
-
-      - name: Run CFFormat
-        run: box run-script format
+          cmd: 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