Merge origin/main into flow-spotless-update

Resolved conflicts:
- Removed check-permissions workflow (deleted in main)
- Updated formatter job to run standalone without check-permissions dependency
- Added environment configuration to build job from main
- Kept formatter.yml deleted and integrated into validation.yml

Author: Artur-

.github/ISSUE_TEMPLATE/vite-bug-report.md

@@ -0,0 +1,56 @@
+name: Sonar PR Analysis
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+    branches: [main]
+
+concurrency:
+  group: sonar-pr-${{ github.event.pull_request.number }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  _HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+  _HEAD_REF: ${{ github.event.pull_request.head.ref }}
+  _BASE_REF: ${{ github.event.pull_request.base.ref }}
+  _PR_NUMBER: ${{ github.event.pull_request.number }}
+  SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+  # PRs use github.base_ref, no push
+  JAVA_VERSION: ${{ (startsWith(github.base_ref, '23.') && '11') || (startsWith(github.base_ref, '24.') && '17') || '21' }}
+
+jobs:
+  sonar-analysis:
+    environment: ${{ github.event.pull_request.head.repo.fork && 'pr-tests' || '' }}
+    name: Sonar Analysis
+    runs-on: ubuntu-latest
+    timeout-minutes: 120
+
+    steps:
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env._HEAD_SHA }}
+          fetch-depth: 0  # Full history required for SonarCloud PR analysis
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: "${{ env.JAVA_VERSION }}"
+          distribution: 'temurin'
+          cache: 'maven'
+
+      - name: Run Sonar analysis
+        run: |
+          mvn clean install sonar:sonar \
+            -ntp -B -e -V \
+            -DskipTests \
+            -Dsonar.projectKey=vaadin_flow \
+            -Dsonar.organization=vaadin \
+            -Dsonar.host.url=https://sonarcloud.io \
+            -Dsonar.pullrequest.key=${{ env._PR_NUMBER }} \
+            -Dsonar.pullrequest.base=${{ env._BASE_REF }} \
+            -Dsonar.pullrequest.branch=${{ env._HEAD_REF }}

.github/workflows/check-permissions.yml

@@ -1,30 +1,28 @@
 name: Flow Validation
 on:
   push:
-    branches: [main, '24.9', '24.8', '24.7', '23.6']
+    branches: [main, '25.0', '24.9', '24.8', '23.6']
   workflow_dispatch:
   pull_request_target:
-    types: [opened, synchronize, reopened, edited]
+    types: [opened, synchronize, reopened]
+    branches: [main]
 permissions:
   contents: write
   pull-requests: write
   issues: write
 concurrency:
-  group: ${{ github.head_ref }} || ${{ github.ref_name }}
+  group: ${{ github.head_ref || github.ref_name }}
   cancel-in-progress: true
 env:
-  HEAD_REF: ${{ github.head_ref }}
-  REF_NAME: ${{ github.ref_name }}
-  BASE_REF: ${{ github.event.pull_request.base.ref }}
-  HEAD_SHA: ${{ github.event.pull_request.head.sha }}
-  PR_NUMBER: ${{ github.event.number }}
-  JAVA_VERSION: '21'
+  _HEAD_REF: ${{ github.head_ref }}
+  _REF_NAME: ${{ github.ref_name }}
+  _BASE_REF: ${{ github.event.pull_request.base.ref }}
+  _HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+  _PR_NUMBER: ${{ github.event.number }}
+  # PRs use github.base_ref, pushes use github.ref_name
+  JAVA_VERSION: ${{ (startsWith(github.base_ref || github.ref_name, '23.') && '11') || (startsWith(github.base_ref || github.ref_name, '24.') && '17') || '21' }}
 jobs:
-  check-permissions:
-    uses: ./.github/workflows/check-permissions.yml
-
   formatter:
-    needs: check-permissions
     name: Format code
     runs-on: ubuntu-latest
     timeout-minutes: 120
@@ -216,23 +214,24 @@ jobs:
           exit 1
 
   build:
-    needs: [check-permissions, formatter]
-    if: always() && needs.check-permissions.result == 'success' && (needs.formatter.result == 'success' || needs.formatter.result == 'skipped')
+    needs: formatter
+    if: always() && (needs.formatter.result == 'success' || needs.formatter.result == 'skipped')
+    environment: ${{ github.event.pull_request.head.repo.fork && 'pr-tests' || '' }}
     timeout-minutes: 30
     runs-on: ubuntu-24.04
     outputs:
       matrix-unit: ${{ steps.set-matrix.outputs.matrix-unit }}
       matrix-it: ${{ steps.set-matrix.outputs.matrix-it }}
     steps:
-      - run: echo "Concurrency Group = ${HEAD_REF:-$REF_NAME}"
+      - run: echo "Concurrency Group = ${_HEAD_REF:-$_REF_NAME}"
       - name: Check secrets
         run: |
           [ -z "${{secrets.TB_LICENSE}}" ] \
             && echo "🚫 **TB_LICENSE** is not defined, check that **${{github.repository}}** repo has a valid secret" \
             | tee -a $GITHUB_STEP_SUMMARY && exit 1 || exit 0
       - uses: actions/checkout@v4
         with:
-          ref: ${{env.HEAD_SHA}}
+          ref: ${{env._HEAD_SHA}}
       - uses: actions/setup-node@v4
         with:
           node-version: '24.9.0'
@@ -280,7 +279,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{env.HEAD_SHA}}
+          ref: ${{env._HEAD_SHA}}
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -346,7 +345,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{env.HEAD_SHA}}
+          ref: ${{env._HEAD_SHA}}
       - uses: actions/setup-node@v4
         with:
           node-version: '24.9.0'
@@ -436,7 +435,7 @@ jobs:
           pattern: tests-output-*
       - uses: actions/checkout@v4
         with:
-          ref: ${{env.HEAD_SHA}}
+          ref: ${{env._HEAD_SHA}}
       - uses: actions/download-artifact@v4
         with:
           name: tests-output
@@ -460,6 +459,7 @@ jobs:
           echo "🚫 THERE ARE TEST MODULES WITH FAILURES or BEEN CANCELLED" | tee -a $GITHUB_STEP_SUMMARY
           exit 1
   api-diff-labeling:
+    environment: ${{ github.event.pull_request.head.repo.fork && 'pr-tests' || '' }}
     if: github.event_name == 'pull_request_target'
     timeout-minutes: 10
     runs-on: ubuntu-24.04
@@ -470,7 +470,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
-          ref: ${{env.HEAD_SHA}}
+          ref: ${{env._HEAD_SHA}}
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
@@ -487,31 +487,55 @@ jobs:
             !~/.m2/repository/com/vaadin
           key: ${{ runner.os }}-maven-api-diff-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-
+      - name: Checkout base branch for API comparison
+        run: |
+          echo "Checking out base branch: ${{ env._BASE_REF }}"
+          git clone --depth 1 --branch ${{ env._BASE_REF }} ${{ github.event.repository.clone_url }} ../base-build
       - name: Determine base version
         id: base-version
+        working-directory: ../base-build
         run: |
-          baseVersion=$(mvn -N -q -DforceStdout  help:evaluate -Dexpression='project.version')
+          baseVersion=$(mvn -N -q -DforceStdout help:evaluate -Dexpression='project.version')
           echo "Base API Version: ${baseVersion}"
           echo "BASE_API_VERSION=${baseVersion}" >> $GITHUB_OUTPUT
-      - name: Use temporary flow version
+      - name: Build base version locally
+        working-directory: ../base-build
         run: |
+          echo "Building base version ${{ steps.base-version.outputs.BASE_API_VERSION }} from branch ${{ env._BASE_REF }}"
+          echo "Running in $(pwd)"
+          mvn clean install -B -ntp -DskipTests
+      - name: Use temporary flow version for PR
+        # working-directory is not set, so it defaults back to the PR branch checkout
+        run: |
+          echo "Setting temporary version for PR branch"
           mvn versions:set -DnewVersion=1111.3.2-SNAPSHOT -B
       - name: Calculate API version difference
         run: |
-          mvn clean install -B -ntp -e -V -pl=flow-server,flow-data,flow-html-components,vaadin-spring -am -Papicmp -DskipTests -Dapi.reference.version=${{ steps.base-version.outputs.BASE_API_VERSION }} -Dtest.use.hub=true -Djapicmp.maven.plugin.version=0.22.0
+          echo "Running in $(pwd)"
+          mvn clean install -B -ntp -e -V -Papicmp -DskipTests -Dapi.reference.version=${{ steps.base-version.outputs.BASE_API_VERSION }} -Dtest.use.hub=true -Djapicmp.maven.plugin.version=0.22.0
       - name: Move API diff results
         run: |
           #!/bin/bash
+          set -e
           mkdir -p apidiff
-          mv flow-server/target/japicmp apidiff/flow-server
-          mv flow-data/target/japicmp apidiff/flow-data
-          mv flow-html-components/target/japicmp apidiff/flow-html-components
-          mv vaadin-spring/target/japicmp apidiff/vaadin-spring
+          # Find all japicmp output directories and move them
+          for module_dir in */target/japicmp; do
+            if [ -d "$module_dir" ]; then
+              module_name=$(dirname $(dirname "$module_dir"))
+              echo "Moving API diff results for $module_name"
+              mv "$module_dir" "apidiff/$module_name"
+            fi
+          done
       - name: Upload API diff artifacts
         uses: actions/upload-artifact@v4
         with:
           name: apidiff-reports
           path: apidiff/
+      - name: Cleanup base build directory
+        if: always()
+        run: |
+          echo "Cleaning up base build directory"
+          rm -rf ../base-build
       - name: Report API DIFF to GitHub
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -523,6 +547,7 @@ jobs:
 
           version_change="0.0.0"
 
+          summary=()
           for file in ${diff_files}
           do
               echo "  Verifying file '${file}'..."
@@ -531,12 +556,23 @@ jobs:
               if [[ "${version_change}" < "${temp_version_change}" ]]; then
                   version_change=${temp_version_change}
               fi
+          
+              if [[ "${temp_version_change}" > "0.0.1" ]]; then
+                summary+=("${file} :: ${temp_version_change}")
+              fi
           done
-
+          
           echo "Discovered version change: ${version_change}"
+          
+          if [[ "${version_change}" > "0.0.1" ]]; then
+            echo "### Significant API changes summary" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            printf '%s\n' "${summary[@]}" >> $GITHUB_STEP_SUMMARY
+          fi
 
           # Get current labels
-          current_labels=$(gh api repos/${{ github.repository }}/issues/${{ env.PR_NUMBER }}/labels --jq '.[].name')
+          current_labels=$(gh api repos/${{ github.repository }}/issues/${{ env._PR_NUMBER }}/labels --jq '.[].name')
 
           # Check if version change label already exists
           if echo "${current_labels}" | grep -q "+${version_change}"; then
@@ -548,12 +584,12 @@ jobs:
               for tlabel in '+0.0.1' '+0.1.0' '+1.0.0'; do
                   if echo "${current_labels}" | grep -q "${tlabel}" && [[ "${version_change}" != "${tlabel##+}" ]]; then
                       echo "Removing label ${tlabel}"
-                      gh api repos/${{ github.repository }}/issues/${{ env.PR_NUMBER }}/labels/"${tlabel}" -X DELETE || true
+                      gh api repos/${{ github.repository }}/issues/${{ env._PR_NUMBER }}/labels/"${tlabel}" -X DELETE || true
                   fi
               done
 
               # Add new version label
-              gh api repos/${{ github.repository }}/issues/${{ env.PR_NUMBER }}/labels \
+              gh api repos/${{ github.repository }}/issues/${{ env._PR_NUMBER }}/labels \
                 -f labels[]="+${version_change}" \
                 --method POST
           fi

.github/workflows/sonar-pr.yml

@@ -17,5 +17,6 @@ Since [Vaadin platform 23.0](https://github.com/vaadin/platform), Flow major and
 | 2.12   | 14.13 (LATEST commercial with Java 8+ support and Servlet 3)            | 2.12                                                    |
 | 23.6   | 23.6 (LATEST commercial with Java 11+ support and Servlet 3)            | 23.6                                                    |
 | 24.8   | 24.8 (maintained minor release, Java 17+, Jakarta EE 10, Spring-boot 3) | 24.8                                                    |
-| 24.9   | 24.9 (LATEST release, Java 17+, Jakarta EE 10, Spring-boot 3)           | 24.9                                                    |
-| main   | 25.0 (Vaadin 25.0 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.0                                                    |
+| 24.9   | 24.9 (LATEST 24 minor release, Java 17+, Jakarta EE 10, Spring-boot 3)  | 24.9                                                    |
+| 25.0   | 25.0 (LATEST release, Java 21+, Jakarta EE 11, Spring-boot 4)           | 25.0                                                    |
+| main   | 25.1 (Vaadin 25.1 preparations, Java 21+, Jakarta EE 11, Spring-boot 4) | 25.1                                                    |

.github/workflows/validation.yml

@@ -4,13 +4,17 @@
   <parent>
     <groupId>com.vaadin</groupId>
     <artifactId>flow-project</artifactId>
-    <version>25.0-SNAPSHOT</version>
+    <version>25.1-SNAPSHOT</version>
   </parent>
   <artifactId>flow-bom</artifactId>
   <packaging>pom</packaging>
   <name>Flow Bill of Materials</name>
   <description>Flow Bill of Materials</description>
 
+  <properties>
+    <flow.apicmp.skip>true</flow.apicmp.skip>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <dependency>
@@ -78,6 +82,12 @@
         <artifactId>flow-dnd</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.vaadin</groupId>
+        <artifactId>flow-build-tools</artifactId>
+        <version>${project.version}</version>
+        <classifier>shaded</classifier>
+      </dependency>
       <dependency>
         <groupId>com.vaadin</groupId>
         <artifactId>vaadin-dev-server</artifactId>