Merge branch 'development' into kv-oidc-updates-4041

Author: Karuna-Mendix

.github/workflows/branch-deletion-pr-creation.yml

@@ -38,10 +38,18 @@ jobs:
 
       - name: Process branches
         id: branch-data
+        env:
+          MIN_AGE_DAYS: ${{ github.event.inputs.min_age_days || '27' }}
         run: |
           set -e
           ALL_BRANCHES=$(git branch -r | grep -v "origin/HEAD" | sed 's/origin\///')
-          MIN_AGE_DAYS=${{ github.event.inputs.min_age_days || 27 }}
+          MIN_AGE_DAYS=${MIN_AGE_DAYS:-27}
+
+          echo "MIN_AGE_DAYS=${MIN_AGE_DAYS}"
+
+          PROTECTED_COUNT=0
+          MERGED_COUNT=0
+          UNMERGED_COUNT=0
 
           PROTECTED_BRANCHES=()
           MERGED_BRANCHES_TO_PROCESS=()
@@ -54,38 +62,56 @@ jobs:
 
           for BRANCH in $ALL_BRANCHES; do
             branch_lower=$(echo "$BRANCH" | tr '[:upper:]' '[:lower:]')
-            if [[ $branch_lower =~ (backup|development|main|master|production) ]]; then
-              PROTECTED_BRANCHES+=("$BRANCH (protected)")
+            if [[ $branch_lower == *backup* || $branch_lower =~ ^(development|main|master|production)(-[0-9]+)?$ ]]; then
+              PROTECTED_BRANCHES+=("$BRANCH")
+              PROTECTED_COUNT=$((PROTECTED_COUNT+1))
             elif git branch -r --merged origin/development | grep -q "origin/$BRANCH"; then
               MERGED_BRANCHES_TO_PROCESS+=("$BRANCH")
+              MERGED_COUNT=$((MERGED_COUNT+1))
             else
-              UNMERGED_BRANCHES+=("$BRANCH (not merged)")
+              UNMERGED_BRANCHES+=("$BRANCH")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
             fi
           done
 
+          echo "branch totals: protected=${PROTECTED_COUNT} merged=${MERGED_COUNT} unmerged=${UNMERGED_COUNT}"
+
           for BRANCH in "${MERGED_BRANCHES_TO_PROCESS[@]}"; do
             MERGE_HASH=$(git log --grep="Merge branch.*$BRANCH" origin/development -n 1 --pretty=format:"%H" || true)
-            [ -z "$MERGE_HASH" ] && MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H")
-            
-            MERGE_DATE=$(git show -s --format=%ct $MERGE_HASH)
-            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE) / 86400 ))
-            
+            if [ -z "$MERGE_HASH" ]; then
+              MERGE_HASH=$(git log -n 1 origin/$BRANCH --pretty=format:"%H" || true)
+            fi
+
+            if [ -z "$MERGE_HASH" ]; then
+              echo "WARN: no merge commit found for $BRANCH — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-hash)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            MERGE_DATE_EPOCH=$(git show -s --format=%ct $MERGE_HASH 2>/dev/null || true)
+            if [ -z "$MERGE_DATE_EPOCH" ]; then
+              echo "WARN: could not read commit date for $BRANCH (hash=$MERGE_HASH) — skipping"
+              UNMERGED_BRANCHES+=("$BRANCH (no-merge-date)")
+              UNMERGED_COUNT=$((UNMERGED_COUNT+1))
+              continue
+            fi
+
+            DAYS_AGO=$(( ($(date +%s) - MERGE_DATE_EPOCH) / 86400 ))
+
             if [[ $DAYS_AGO -ge $MIN_AGE_DAYS ]]; then
-              BRANCHES_TO_DELETE+=("$BRANCH")
+              BRANCHES_TO_DELETE+=("$BRANCH (${DAYS_AGO}d since merge)")
             else
-              BRANCHES_TOO_RECENT+=("$BRANCH (too recent: ${DAYS_AGO}d)")
+              BRANCHES_TOO_RECENT+=("$BRANCH (${DAYS_AGO}d since merge)")
             fi
+            echo "checked $BRANCH: hash=$MERGE_HASH date=$MERGE_DATE_EPOCH days=${DAYS_AGO}"
           done
 
-           ALL_NON_DELETED=(
-            "${PROTECTED_BRANCHES[@]}" 
-            "${BRANCHES_TOO_RECENT[@]}"
-            "${UNMERGED_BRANCHES[@]}"
-          )
-
           echo "HAS_BRANCHES=$([ ${#BRANCHES_TO_DELETE[@]} -gt 0 ] && echo true || echo false)" >> $GITHUB_ENV
           echo "BRANCHES_TO_DELETE=$(printf -- '- %s\n' "${BRANCHES_TO_DELETE[@]}" | jq -Rs .)" >> $GITHUB_ENV
-          echo "ALL_NON_DELETED=$(printf -- '- %s\n' "${ALL_NON_DELETED[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "PROTECTED_BRANCHES=$(printf -- '- %s\n' "${PROTECTED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "BRANCHES_TOO_RECENT=$(printf -- '- %s\n' "${BRANCHES_TOO_RECENT[@]}" | jq -Rs .)" >> $GITHUB_ENV
+          echo "UNMERGED_BRANCHES=$(printf -- '- %s\n' "${UNMERGED_BRANCHES[@]}" | jq -Rs .)" >> $GITHUB_ENV
 
       - name: Create Deletion PR
         if: env.HAS_BRANCHES == 'true'
@@ -97,8 +123,14 @@ jobs:
             ### Branches for Deletion
             ${{ fromJSON(env.BRANCHES_TO_DELETE) }}
 
-            ### Protected/Recent Branches
-            ${{ fromJSON(env.ALL_NON_DELETED) }}
+            ### Protected Branches
+            ${{ fromJSON(env.PROTECTED_BRANCHES) }}
+
+            ### Recent Merges (too recent to delete)
+            ${{ fromJSON(env.BRANCHES_TOO_RECENT) }}
+
+            ### Unmerged Branches
+            ${{ fromJSON(env.UNMERGED_BRANCHES) }}
           base: development
           labels: Internal WIP
           assignees: MarkvanMents,OlufunkeMoronfolu

.gitignore

@@ -8,6 +8,7 @@ hugo.exe
 /.hugo_build.lock
 /.claude/audit.log
 /.claude/settings.local.json
+/.mcp.json
 
 # For Mac users
 .DS_Store

content/en/docs/community-tools/contribute-to-mendix-docs/markdown-shortcodes.md

@@ -189,7 +189,7 @@ If the tab pane contains code with an asterisk (`*`) in it, the linter rule for
 
 Mendix videos are hosted on Vidyard. For more information, see [the Videos section of the Style Guide](https://mendix.atlassian.net/wiki/spaces/RNDHB/pages/2510061889/Images+Icons+and+Videos#Videos).
 
-{{< vidyard "GwE17mzGma5NAvDnXrVdFA" >}}
+{{< vidyard id="GwE17mzGma5NAvDnXrVdFA" date_updated="YYYY-MM-DD" >}}
 
 ## Other Markdown and HTML Guidelines
 

content/en/docs/community-tools/how-to-set-up-your-partner-profile.md

@@ -75,8 +75,6 @@ If you already had projects in the old partner profile, they can be automaticall
 
 {{% alert color="info" %}}Ensure you have customer approval for publishing project references.{{% /alert %}}
 
-For technical support or questions, contact partnerfinder@mendix.com.
-
 ## Read More
 
 * [Mendix Profile](/portal/mendix-profile/)

content/en/docs/deployment/general/licensing-apps/_index.md

@@ -90,6 +90,8 @@ You will need to add the license credentials and configure the license in the Me
 
 ### Cloud Foundry{#cloudfoundry}
 
+The following steps describe activating the license for deployments using the Cloud Foundry Buildpack. If you are deploying using Portable App Distribution, follow the steps in the [Portable App Distribution](#portableappdistribution) section below. 
+
 To activate a license on your app running on Cloud Foundry, you need the license credentials provided by Mendix Support.
 
 The two environment variables `LICENSE_ID` and `LICENSE_KEY` need to be set to the values of the **LicenseId** and **LicenseKey** provided by Mendix Support. Do this by running the following two commands, replacing `<YOUR_APP>` with the name of your app.
@@ -103,6 +105,8 @@ Then restart the app so that the environment variables are read and the license
 
 ### Docker
 
+The following steps describe activating the license for deployments using the Docker Buildpack. If you are deploying using Portable App Distribution, follow the steps in the [Portable App Distribution](#portableappdistribution) section below. 
+
 To activate a license on your app running in a Docker container, you need the license credentials provided by Mendix Support.
 
 Two additional environment variables, `LICENSE_ID` and `LICENSE_KEY`, need to be set to the values of the **LicenseId** and **LicenseKey** provided by Mendix Support. To do this, add them to the startup command for your container.
@@ -133,6 +137,8 @@ For full instructions on how to do this, see [Activate a Mendix License on Micro
 
 ### Unix-Like Server
 
+The following steps describe activating the license for deployments using the M2EE tool. If you are deploying using Portable App Distribution, follow the steps in the [Portable App Distribution](#portableappdistribution) section below. 
+
 To license a Mendix app on Linux or another Unix-like operating system, follow these steps:
 
 1. Open the interactive m2ee console.
@@ -141,3 +147,20 @@ To license a Mendix app on Linux or another Unix-like operating system, follow t
 4. Activate your license on the server, using the m2ee command `activate_license`.
 
 For more instructions on how to do this, see [Linux Deployment](/developerportal/deploy/linux/).
+
+### Portable App Distribution{#portableappdistribution}
+
+To activate the license on a Mendix app using Portable App Distribution on either Docker, Cloud Foundry, or Unix-like servers, follow these steps:
+
+1. Open the `$ConfigName.conf` in `etc/configurations`.
+2.  Add the `LicenseID` and `LicenseKey` to your runtime configuration:
+   
+```bash
+# License configuration
+runtime.params {
+  License.LicenseID = <licenseId>
+  License.LicenseKey = <license_Key
+}
+```
+
+The values for these properties can also be passed by using environment variables for your deployment type, or by creating a separate config file.

content/en/docs/deployment/on-premises-design/ms-windows/sql-server/restoring-a-sql-server-database.md

@@ -15,7 +15,7 @@ This how-to teaches you how to do the following:
 
 For a deep-dive look into this action, check out this video:
 
-{{< vidyard "WZu7QtHZPjtYUTdcV58PKr?" >}}
+{{< vidyard id="WZu7QtHZPjtYUTdcV58PKr?" >}}
 
 ## Prerequisites
 

content/en/docs/deployment/private-cloud/private-cloud-cluster/private-cloud-storage-plans.md

@@ -156,9 +156,9 @@ The AWS S3 library is also updated in the latest LTS versions of Studio Pro:
 
 Mendix Operator 2.25 (or later versions) will automatically recognise an S3 bucket's region from its endpoint address:
 
-* If the bucket endpoint has a `<subdomains>.<region>.amazonaws.com` format (or `<subdomains>.<region>.amazonaws.com.<suffix>` format for AWS China regions),
-the Operator uses `<region>` as the S3 region name.
-* If the S3 bucket endpoint does not match this format, the Mendix Operator will use a default `us-east-1` region, as this works with most S3-compatible buckets like [Minio](#blob-minio) and [Google Cloud Storage](#blob-gcp-storage-bucket).
+* If the bucket endpoint has a `<subdomains>.<region>.amazonaws.com` format (or `<subdomains>.<region>.amazonaws.com.<suffix>` format for AWS China regions), the Operator uses `<region>` as the S3 region name.
+* For buckets that use the `<bucketname>.s3.amazonaws.com` [Legacy global endpoint](https://docs.aws.amazon.com/AmazonS3/latest/userguide/VirtualHosting.html#VirtualHostingBackwardsCompatibility) format, Mendix Operator 2.26.1 (or later versions) detects the bucket region with a [HeadBucket call](https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadBucket.html#API_HeadBucket_ResponseSyntax). If the call fails, the Mendix Operator uses the default `us-east-1` region instead.
+* If the S3 bucket endpoint does not match this format, the Mendix Operator uses a default `us-east-1` region, as this works with most S3-compatible buckets (for example, [Minio](#blob-minio) and [Google Cloud Storage](#blob-gcp-storage-bucket)).
 
 In some scenarios (legacy or custom S3 endpoints), this autodetection might not work correctly. In this case, you can manually specify the S3 bucket region by setting the [com.mendix.storage.s3.Region](/refguide/custom-settings/#commendixstorages3Region) Custom Runtime Setting. A manually specified `com.mendix.storage.s3.Region` will override the autodetected bucket region.
 

content/en/docs/deployment/private-cloud/private-cloud-supported-environments.md

@@ -36,8 +36,8 @@ If deploying to Red Hat OpenShift, you need to specify that specifically when cr
 
 Mendix on Kubernetes Operator `v2.*.*` is the latest version which officially supports:
 
-* Kubernetes versions 1.19 through 1.34
-* OpenShift 4.6 through 4.20
+* Kubernetes versions 1.19 through 1.35
+* OpenShift 4.6 through 4.21
 
 {{% alert color="warning" %}}
 Kubernetes 1.22 is a [new release](https://kubernetes.io/blog/2021/08/04/kubernetes-1-22-release-announcement/) which removes support for several deprecated APIs and features.

content/en/docs/developerportal/digital-execution/implement-mendix/mendix-ecosystem.md

@@ -10,7 +10,7 @@ aliases:
 
 ## Introduction
 
-{{< vidyard "AVffVf7KCVt7h1ioBvUQ1f" >}} 
+{{< vidyard id="AVffVf7KCVt7h1ioBvUQ1f" >}} 
 
 This section offers an overview of the Mendix platform, and outlines the 5 P’s of Digital Transformation and their importance to your Mendix success.  
 

content/en/docs/howto8/front-end/customize-styling/calypso.md

@@ -19,7 +19,7 @@ Calypso is the easiest styling solution for most users. However, if you already
 
 For a deep-dive look into styling with Calypso, check out this video:
 
-{{< vidyard "M2NCccTnfnh7Yx2gjEyBpf" >}}
+{{< vidyard id="M2NCccTnfnh7Yx2gjEyBpf" >}}
 
 ## Prerequisites