Merge branch 'main' into HHH-16283

Author: NathanQingyangXu

.git-blame-ignore-revs

@@ -1,3 +1,7 @@
 # Initial commits that enabled spotless automatic formatting
 59731c089e9d649a663c81d9622b54557d6aba37
 4d63ffd98cdead513ab0be0fa23f9787423092d3
+# Envers removal/restore
+9c7dd3bf34dfbb2f4fa9eb79a0294c2cc759c836
+b2a528f2945cee26667b22b867ccef143b7c430c
+4273f1cde06f3622f50c2846078398c1977a49c4

.gitattributes

@@ -1 +1,17 @@
-* text eol=lf
+# By default, detect text files automatically, and use whatever line terminators make sense for the OS
+* text=auto eol=lf
+
+# Java files are text, and we want Java-friendly readable hunk headers for diff
+*.java text diff=java eol=lf
+
+# Force LF/CRLF format for files that are known to require it.
+*.sh text eol=lf
+*.bat text eol=crlf
+
+# For some reason the above is not enough, in particular for gradlew.bat,
+# as some commands (git status, git add --renormalize) will still change its line endings to LF.
+# So, we explicitly tell git not to mess with *.bat line endings.
+# It's annoying as git won't show diffs for these files anymore,
+# but that's the best I could come up with after an hour of head-scratching.
+*.bat binary
+

.github/ci-prerequisites-atlas.sh

@@ -0,0 +1,6 @@
+# Reclaims disk space and sanitizes user home on Atlas infrastructure
+
+# We use the GitHub cache for the relevant parts of these directories.
+# Also, we do not want to keep things like ~/.gradle/build-scan-data.
+rm -rf ~/.gradle/
+rm -rf ~/.m2/

.github/dependabot.yml

@@ -17,4 +17,11 @@ updates:
   - package-ecosystem: github-actions
     directory: "/"
     schedule:
-      interval: daily
+      interval: monthly
+    groups:
+      workflow-actions:
+        patterns:
+          - "*"
+    allow:
+      - dependency-name: "actions/*"
+      - dependency-name: "redhat-actions/*"

.github/hibernate-github-bot.yml

@@ -5,6 +5,7 @@ jira:
   ignoreFiles:
     # Git
     - ".git*"
+    - "*/.git*"
     - ".mailmap"
     # Gradle
     - "gradlew*"
@@ -19,6 +20,7 @@ jira:
     - "ci/"
     - "databases/"
     - "*.sh"
+    - "*.bat"
     - "Jenkinsfile"
     - "*/Jenkinsfile"
     - "*.Jenkinsfile"
@@ -37,6 +39,8 @@ jira:
     - "release/"
     - "rules/"
     - "shared/"
+    - ".sdkmanrc"
+    - "*/.sdkmanrc"
 develocity:
   buildScan:
     addCheck: true
@@ -56,4 +60,6 @@ develocity:
         pattern: "((?:h2|postgres(?:ql)?|pgsql|mysql|mariadb|mssql|tidb|cockroach(?:db)?|oracle|db2|hsqldb|edb|sybase)(?:.*(?=_ci)|.*))(?:_ci)?"
         replacement: "$1"
       - pattern: "main|HEAD|\\d+.\\d+|PR-\\d+"
-        replacement: "" # Just remove these tags
+        replacement: "" # Just remove these tags
+licenseAgreement:
+  enabled: true

.github/workflows/atlas.yml

@@ -0,0 +1,78 @@
+name: GH Actions CI reporting
+
+on:
+  workflow_run:
+    workflows: [ "GH Actions CI" ]
+    types: [ completed ]
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  publish-build-scans:
+    name: Publish Develocity build scans
+    if: github.repository == 'hibernate/hibernate-orm' && github.event.workflow_run.conclusion != 'cancelled'
+    runs-on: ubuntu-latest
+    steps:
+      # Checkout target branch which has trusted code
+      - name: Check out target branch
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+          ref: ${{ github.ref }}
+      - name: Set up JDK
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      - name: Generate cache key
+        id: cache-key
+        run: |
+          CURRENT_BRANCH="${{ github.repository != 'hibernate/hibernate-orm' && 'fork' || github.base_ref || github.ref_name }}"
+          CURRENT_MONTH=$(/bin/date -u "+%Y-%m")
+          CURRENT_DAY=$(/bin/date -u "+%d")
+          ROOT_CACHE_KEY="buildtool-cache"
+          echo "buildtool-monthly-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}" >> $GITHUB_OUTPUT
+          echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
+          echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
+      - name: Restore Maven/Gradle Dependency/Dist Caches
+        uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+        with:
+          path: |
+            ~/.m2/repository/
+            ~/.m2/wrapper/
+            ~/.gradle/caches/modules-2
+            ~/.gradle/wrapper/
+          key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
+          restore-keys: |
+            ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
+            ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
+
+      - name: Download GitHub Actions artifacts for the Develocity build scans
+        id: downloadBuildScan
+        uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
+        with:
+          pattern: build-scan-data-*
+          github-token: ${{ github.token }}
+          repository: ${{ github.repository }}
+          run-id: ${{ github.event.workflow_run.id }}
+          path: /tmp/downloaded-build-scan-data/
+        # Don't fail the build if there are no matching artifacts
+        continue-on-error: true
+      - name: Publish Develocity build scans for previous builds
+        if: ${{ steps.downloadBuildScan.outcome != 'failure'}}
+        run: |
+          shopt -s nullglob # Don't run the loop below if there are no artifacts
+          status=0
+          mkdir -p ~/.gradle/
+          for build_scan_data_directory in /tmp/downloaded-build-scan-data/*
+          do
+            rm -rf ~/.gradle/build-scan-data
+            mv "$build_scan_data_directory" ~/.gradle/build-scan-data \
+            && ./gradlew --no-build-cache buildScanPublishPrevious || status=1
+          done
+          exit $status
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY_PR }}