Merge "micro-integrator-3.1.4" into "stable/mi"

.github/actions/pr/action.yml

@@ -128,17 +128,17 @@ runs:
         run: |
           baseBranch=""
           if [ "${{ inputs.ballerina }}" == 'true' ]; then
-            baseBranch="release-ballerina"
+            baseBranch="stable/ballerina"
           elif [ "${{ inputs.bi }}" == 'true' ]; then
-            baseBranch="release-bi"
+            baseBranch="stable/bi"
           elif [ "${{ inputs.wso2-platform }}" == 'true' ]; then
-            baseBranch="release-platform"
+            baseBranch="stable/platform"
           elif [ "${{ inputs.choreo }}" == 'true' ]; then
-            baseBranch="release-choreo"
+            baseBranch="stable/choreo"
           elif [ "${{ inputs.apk }}" == 'true' ]; then
-            baseBranch="release-apk"
+            baseBranch="stable/apk"
           elif [ "${{ inputs.mi }}" == 'true' ]; then
-            baseBranch="release-mi"
+            baseBranch="stable/mi"
           fi
           pr=$(gh pr create -B "$baseBranch" -H "${{ inputs.version }}" --title "Merge \"${{ inputs.version }}\" into \"$baseBranch\"" --body '$subject')
           echo "prURL=$pr" >> $GITHUB_OUTPUT

.github/workflows/build.yml

@@ -233,7 +233,7 @@ jobs:
     name: Run Ballerina extension tests
     needs: Build_Stage
     if: false
-    # if: ${{ inputs.runTests || (inputs.isReleaseBuild && (inputs.ballerina || inputs.bi)) || needs.Build_Stage.outputs.runBalExtTests == 'true' || github.base_ref == 'release-ballerina' }}
+    # if: ${{ inputs.runTests || (inputs.isReleaseBuild && (inputs.ballerina || inputs.bi)) || needs.Build_Stage.outputs.runBalExtTests == 'true' || github.base_ref == 'stable/ballerina' }}
     timeout-minutes: 45
     runs-on: ${{ inputs.runOnAWS && inputs.awsRunnerId || 'ubuntu-latest' }}
     steps:
@@ -281,7 +281,7 @@ jobs:
   ExtTest_MI:
     name: Run MI diagram tests
     needs: Build_Stage
-    if: ${{ inputs.runTests || (inputs.isReleaseBuild && inputs.mi) || needs.Build_Stage.outputs.runMIExtTests == 'true' || github.base_ref == 'release-mi' }}
+    if: ${{ inputs.runTests || (inputs.isReleaseBuild && inputs.mi) || needs.Build_Stage.outputs.runMIExtTests == 'true' || github.base_ref == 'stable/mi' }}
     timeout-minutes: 30
     runs-on: ${{ inputs.runOnAWS && inputs.awsRunnerId || 'ubuntu-latest' }}
     steps:

.github/workflows/sync-main-with-releases.yml

@@ -4,7 +4,7 @@ on:
     types:
       - closed
     branches:
-      - 'release-**'
+      - 'stable/**'
 
 jobs:
   sync-main:

.github/workflows/test-pr.yml

@@ -17,5 +17,5 @@ jobs:
     with:
       runOnAWS: ${{ contains(github.event.pull_request.labels.*.name, 'Runner/AWS') }}
       enableE2ETests: ${{ contains(github.event.pull_request.labels.*.name, 'Checks/Enable UI Tests') }}
-      runBIE2ETests: ${{ contains(github.event.pull_request.labels.*.name, 'Checks/Run BI UI Tests') || github.base_ref == 'release-bi' || github.base_ref == 'release-ballerina' }}
-      runMIE2ETests: ${{ contains(github.event.pull_request.labels.*.name, 'Checks/Run MI UI Tests') || github.base_ref == 'release-mi' }}
+      runBIE2ETests: ${{ contains(github.event.pull_request.labels.*.name, 'Checks/Run BI UI Tests') || github.base_ref == 'stable/bi' || github.base_ref == 'stable/ballerina' }}
+      runMIE2ETests: ${{ contains(github.event.pull_request.labels.*.name, 'Checks/Run MI UI Tests') || github.base_ref == 'stable/mi' }}

common/config/rush/.pnpmfile.cjs

@@ -46,6 +46,24 @@ module.exports = {
         if (pkg.dependencies['lodash']) {
           pkg.dependencies['lodash'] = '4.17.23';
         }
+        if (pkg.dependencies['qs']) {
+          pkg.dependencies['qs'] = '6.14.2';
+        }
+        if (pkg.dependencies['diff']) {
+          pkg.dependencies['diff'] = '^8.0.3';
+        }
+        if (pkg.dependencies['eslint']) {
+          pkg.dependencies['eslint'] = '^9.27.0';
+        }
+        if (pkg.dependencies['fast-xml-parser']) {
+          pkg.dependencies['fast-xml-parser'] = '5.3.4';
+        }
+        if (pkg.dependencies['hono']) {
+          pkg.dependencies['hono'] = '^4.11.7';
+        }
+        if (pkg.dependencies['lodash']) {
+          pkg.dependencies['lodash'] = '4.17.23';
+        }
       }
 
       if (pkg.devDependencies) {
@@ -79,6 +97,24 @@ module.exports = {
         if (pkg.devDependencies['lodash']) {
           pkg.devDependencies['lodash'] = '4.17.23';
         }
+        if (pkg.devDependencies['qs']) {
+          pkg.devDependencies['qs'] = '6.14.2';
+        }
+        if (pkg.devDependencies['diff']) {
+          pkg.devDependencies['diff'] = '^8.0.3';
+        }
+        if (pkg.devDependencies['eslint']) {
+          pkg.devDependencies['eslint'] = '^9.27.0';
+        }
+        if (pkg.devDependencies['fast-xml-parser']) {
+          pkg.devDependencies['fast-xml-parser'] = '5.3.4';
+        }
+        if (pkg.devDependencies['hono']) {
+          pkg.devDependencies['hono'] = '^4.11.7';
+        }
+        if (pkg.devDependencies['lodash']) {
+          pkg.devDependencies['lodash'] = '4.17.23';
+        }
       }
 
       return pkg;