Rebase to tag 5.6

.github/workflows/codeql.yml

@@ -0,0 +1,63 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ '5.6' ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ '5.6' ]
+  schedule:
+    - cron: '34 11 * * 4'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          queries: +security-and-quality
+
+
+      # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+      # If this step fails, then you should remove it and run the build manually (see below)
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+      #   If the Autobuild fails above, remove it and uncomment the following three lines.
+      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+      # - run: |
+      #   echo "Run, Build Application using script"
+      #   ./location_of_script_within_repo/buildscript.sh
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+        with:
+          category: "/language:${{matrix.language}}"

.github/workflows/contributor-build.yml

@@ -1,4 +1,4 @@
-# The main CI of Hibernate ORM is https://ci.hibernate.org/job/hibernate-orm-6.0-h2-main/.
+# The main CI of Hibernate ORM is https://ci.hibernate.org/job/hibernate-orm-5.6-h2/.
 # However, Hibernate ORM builds run on GitHub actions regularly
 # to check that it still works and can be used in GitHub forks.
 # See https://docs.github.com/en/free-pro-team@latest/actions
@@ -13,35 +13,41 @@ on:
   pull_request:
     branches:
       - '5.6'
+
+permissions: {} # none
+
+# See https://github.com/hibernate/hibernate-orm/pull/4615 for a description of the behavior we're getting.
+concurrency:
+  # Consider that two builds are in the same concurrency group (cannot run concurrently)
+  # if they use the same workflow and are about the same branch ("ref") or pull request.
+  group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}, pr = ${{ github.event.pull_request.id }}"
+  # Cancel previous builds in the same concurrency group even if they are in process
+  # for pull requests or pushes to forks (not the upstream repository).
+  cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'hibernate/hibernate-orm' }}
+
 jobs:
   build:
+    permissions:
+      contents: read
     name: Java 8
     runs-on: ubuntu-latest
-    # We want to know the test results of all matrix entries
-    continue-on-error: true
     strategy:
       fail-fast: false
       matrix:
-        # When GitHub Actions supports it: https://github.com/actions/toolkit/issues/399
-        # We will use the experimental flag as indicator whether a failure should cause a workflow failure
         include:
           - rdbms: h2
-            experimental: false
+#          - rdbms: hsqldb
           - rdbms: derby
-            experimental: true
+          - rdbms: mysql8
           - rdbms: mariadb
-            experimental: true
-          - rdbms: postgresql
-            experimental: true
+          - rdbms: postgresql_9_5
+          - rdbms: postgresql_13
           - rdbms: oracle
-            experimental: true
           - rdbms: db2
-            experimental: true
           - rdbms: mssql
-            experimental: true
+          - rdbms: sybase
 # Running with HANA requires at least 8GB memory just for the database, which we don't have on GH Actions runners
 #          - rdbms: hana
-#            experimental: true
     steps:
       - uses: actions/checkout@v2
         with:
@@ -77,53 +83,12 @@ jobs:
         run: ./ci/build-github.sh
         shell: bash
       - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: test-reports-java8-${{ matrix.rdbms }}
           path: |
             ./**/target/reports/tests/
             ./**/target/reports/checkstyle/
       - name: Omit produced artifacts from build cache
-        run: ./ci/before-cache.sh
-  build11:
-    name: Java 11
-    runs-on: ubuntu-latest
-    # We want to know the test results of all matrix entries
-    continue-on-error: true
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          persist-credentials: false
-      - name: Set up Java 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Get year/month for cache key
-        id: get-date
-        run: |
-          echo "::set-output name=yearmonth::$(/bin/date -u "+%Y-%m")"
-        shell: bash
-      - name: Cache Maven local repository
-        uses: actions/cache@v2
-        id: cache-maven
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-          # refresh cache every month to avoid unlimited growth
-          key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
-      - name: Run build script
-        run: ./ci/build-github.sh
-        shell: bash
-      - name: Upload test reports (if Gradle failed)
-        uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: test-reports-java11
-          path: |
-            ./**/target/reports/tests/
-            ./**/target/reports/checkstyle/
-      - name: Omit produced artifacts from build cache
-        run: ./ci/before-cache.sh
+        run: ./ci/before-cache.sh