Skip to content

Commit 3343c0b

Browse files
theigltheigl
committed
Merge remote-tracking branch 'origin/main' into main-perf
2 parents 98e9c46 + 695c3e5 commit 3343c0b

File tree

3,050 files changed

+118068
-30241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,050 files changed

+118068
-30241
lines changed

‎.github/hibernate-github-bot.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,38 @@
22
jira:
33
projectKey: "HHH"
44
insertLinksInPullRequests: true
5+
ignoreFiles:
6+
# Git
7+
- ".git*"
8+
- ".mailmap"
9+
# Gradle
10+
- "gradlew*"
11+
- "gradle/"
12+
- "local-build-plugins/"
13+
- "build.gradle"
14+
# NOT settings.gradle: contains dependency versions, changing those requires a Jira issue
15+
- "utilities.gradle"
16+
# CI
17+
- ".github/"
18+
- ".release/"
19+
- "ci/"
20+
- "databases/"
21+
- "*.sh"
22+
- "Jenkinsfile"
23+
- "*/Jenkinsfile"
24+
- "*.Jenkinsfile"
25+
# In-repo documentation
26+
- "design/"
27+
- "README.adoc"
28+
- "MAINTAINERS.md"
29+
- "CONTRIBUTING.md"
30+
# Misc. build files
31+
- "checkerstubs/"
32+
- "drivers/"
33+
- "edb/"
34+
- "etc/"
35+
- "javadoc/"
36+
- "patched-libs/"
37+
- "release/"
38+
- "rules/"
39+
- "shared/"

‎.github/workflows/atlas.yml

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
# The main CI of Hibernate ORM is https://ci.hibernate.org/job/hibernate-orm-pipeline/.
2+
# However, Hibernate ORM builds run on GitHub actions regularly
3+
# to check that it still works and can be used in GitHub forks.
4+
# See https://docs.github.com/en/free-pro-team@latest/actions
5+
# for more information about GitHub actions.
6+
7+
name: Hibernate ORM build-Atlas
8+
9+
on:
10+
push:
11+
branches:
12+
- 'main'
13+
pull_request:
14+
branches:
15+
- 'main'
16+
17+
permissions: {} # none
18+
19+
# See https://github.com/hibernate/hibernate-orm/pull/4615 for a description of the behavior we're getting.
20+
concurrency:
21+
# Consider that two builds are in the same concurrency group (cannot run concurrently)
22+
# if they use the same workflow and are about the same branch ("ref") or pull request.
23+
group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}, pr = ${{ github.event.pull_request.id }}"
24+
# Cancel previous builds in the same concurrency group even if they are in process
25+
# for pull requests or pushes to forks (not the upstream repository).
26+
cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'hibernate/hibernate-orm' }}
27+
28+
jobs:
29+
build:
30+
permissions:
31+
contents: read
32+
name: Java 11
33+
# runs-on: ubuntu-latest
34+
runs-on: [self-hosted, Linux, X64, OCI]
35+
strategy:
36+
fail-fast: false
37+
matrix:
38+
include:
39+
- rdbms: oracle_atps
40+
- rdbms: oracle_db19c
41+
- rdbms: oracle_db21c
42+
- rdbms: oracle_db23c
43+
steps:
44+
- uses: actions/checkout@v4
45+
with:
46+
persist-credentials: false
47+
- name: Reclaim Disk Space
48+
run: .github/ci-prerequisites.sh
49+
- name: Start database
50+
env:
51+
RDBMS: ${{ matrix.rdbms }}
52+
RUNID: ${{ github.run_number }}
53+
run: ci/database-start.sh
54+
- name: Set up Java 11
55+
uses: actions/setup-java@v4
56+
with:
57+
distribution: 'temurin'
58+
java-version: '11'
59+
- name: Get year/month for cache key
60+
id: get-date
61+
run: echo "yearmonth=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT
62+
shell: bash
63+
- name: Cache Maven local repository
64+
uses: actions/cache@v4
65+
id: cache-maven
66+
with:
67+
path: |
68+
~/.m2/repository
69+
~/.gradle/caches/
70+
~/.gradle/wrapper/
71+
# refresh cache every month to avoid unlimited growth
72+
key: maven-localrepo-${{ steps.get-date.outputs.yearmonth }}
73+
- name: Run build script
74+
env:
75+
RDBMS: ${{ matrix.rdbms }}
76+
RUNID: ${{ github.run_number }}
77+
run: ./ci/build-github.sh
78+
shell: bash
79+
- name: Upload test reports (if Gradle failed)
80+
uses: actions/upload-artifact@v4
81+
if: failure()
82+
with:
83+
name: test-reports-java11-${{ matrix.rdbms }}
84+
path: |
85+
./**/target/reports/tests/
86+
./**/target/reports/checkstyle/
87+
- name: Omit produced artifacts from build cache
88+
run: ./ci/before-cache.sh

‎.github/workflows/codeql.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ on:
99
schedule:
1010
- cron: '34 11 * * 4'
1111

12+
# See https://github.com/hibernate/hibernate-orm/pull/4615 for a description of the behavior we're getting.
13+
concurrency:
14+
# Consider that two builds are in the same concurrency group (cannot run concurrently)
15+
# if they use the same workflow and are about the same branch ("ref") or pull request.
16+
group: "workflow = ${{ github.workflow }}, ref = ${{ github.event.ref }}, pr = ${{ github.event.pull_request.id }}"
17+
# Cancel previous builds in the same concurrency group even if they are in process
18+
# for pull requests or pushes to forks (not the upstream repository).
19+
cancel-in-progress: ${{ github.event_name == 'pull_request' || github.repository != 'hibernate/hibernate-orm' }}
20+
1221
jobs:
1322
analyze:
1423
name: Analyze
@@ -27,11 +36,11 @@ jobs:
2736

2837
steps:
2938
- name: Checkout repository
30-
uses: actions/checkout@v3
39+
uses: actions/checkout@v4
3140

3241
# Initializes the CodeQL tools for scanning.
3342
- name: Initialize CodeQL
34-
uses: github/codeql-action/init@v2
43+
uses: github/codeql-action/init@v3
3544
with:
3645
languages: ${{ matrix.language }}
3746
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -45,7 +54,7 @@ jobs:
4554
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
4655
# If this step fails, then you should remove it and run the build manually (see below)
4756
- name: Autobuild
48-
uses: github/codeql-action/autobuild@v2
57+
uses: github/codeql-action/autobuild@v3
4958

5059
# ℹ️ Command-line programs to run using the OS shell.
5160
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -58,6 +67,6 @@ jobs:
5867
# ./location_of_script_within_repo/buildscript.sh
5968

6069
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@v2
70+
uses: github/codeql-action/analyze@v3
6271
with:
6372
category: "/language:${{matrix.language}}"

‎.github/workflows/contributor-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
# Running with HANA requires at least 8GB memory just for the database, which we don't have on GH Actions runners
5252
# - rdbms: hana
5353
steps:
54-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
5555
with:
5656
persist-credentials: false
5757
- name: Reclaim Disk Space
@@ -61,7 +61,7 @@ jobs:
6161
RDBMS: ${{ matrix.rdbms }}
6262
run: ci/database-start.sh
6363
- name: Set up Java 11
64-
uses: actions/setup-java@v3
64+
uses: actions/setup-java@v4
6565
with:
6666
distribution: 'temurin'
6767
java-version: '11'
@@ -70,7 +70,7 @@ jobs:
7070
run: echo "yearmonth=$(/bin/date -u "+%Y-%m")" >> $GITHUB_OUTPUT
7171
shell: bash
7272
- name: Cache Maven local repository
73-
uses: actions/cache@v3
73+
uses: actions/cache@v4
7474
id: cache-maven
7575
with:
7676
path: |
@@ -82,10 +82,12 @@ jobs:
8282
- name: Run build script
8383
env:
8484
RDBMS: ${{ matrix.rdbms }}
85+
POPULATE_REMOTE_GRADLE_CACHE: true
86+
GRADLE_ENTERPRISE_ACCESS_KEY: "${{ secrets.DEVELOCITY_ACCESS_TOKEN }}"
8587
run: ./ci/build-github.sh
8688
shell: bash
8789
- name: Upload test reports (if Gradle failed)
88-
uses: actions/upload-artifact@v3
90+
uses: actions/upload-artifact@v4
8991
if: failure()
9092
with:
9193
name: test-reports-java11-${{ matrix.rdbms }}

‎.mailmap

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
#
2+
# This is a .mailmap file : see gitmailmap for format specification and documentation.
3+
#
4+
# We use this as helper metadata to recognize that sometimes contributors change
5+
# email addresses, preferred names, or perhaps have had mistakes in their git
6+
# configuration at the time of contributing a patch and wich to correct them.
7+
# This can be useful in various ways, such as to allow contributors to let others
8+
# know their preferred name and contact point should they change in the future.
9+
#
10+
# This file is taken into account by various `git log` options; for example use:
11+
# # git log --mailmap --format="%aN %aE" | sort | uniq
12+
# to produce a list of contributors which applies the normalization rules from this file;
13+
# this is also a reasonable strategy to verify effectiveness of updates to this file.
14+
#
15+
# # MAINTENANCE
16+
# Feel free to provide mappings for your own git identifiers, should you wish to
17+
# update your own preferred name and/or email address.
18+
# Bear in mind that in doing so, you're making such information public.
19+
#
20+
# The team might occasionally try to keep this file up to date, but we won't always
21+
# have the necessary information to do so.
22+
# For example, if two records have the same email address we can assume they refer to the
23+
# same person, and we might be able to guess which name format is preferred, but
24+
# we might not absolute certainty about the preference.
25+
# On the other hand, if two records show the same name but different email addresses
26+
# we won't know for sure if they are not two different persons happening to have the
27+
# same name; even if they are the same person we wouldn't be able to tell which one
28+
# is their preferred email address.
29+
# In particular we would prefer to be cautious to not choose an email address which is
30+
# potentially no longer in use, so we'd rather keep both records rather than risk
31+
# no longer being able to get in touch.
32+
# For all these reasons, please only add a mapping to this file if you are the person
33+
# affected by the record, or if you know with certainty that the mapping is correct.
34+
#
35+
# # IMPORTANT !
36+
# Do not add personal information here which was not explicitly contributed by the person:
37+
# you might have got information about a more suitable email address of someone listed here
38+
# but you can't publish such information here without their permission.
39+
# We only use this file to re-map, and reorganize information which was already contributed,
40+
# even if this comes at a potential risk of maintaining information which is no longer
41+
# accurate.
42+
# This also comes with no guarantees whatsoever, in fact I would suggest to never
43+
# assume any information here is accurate.
44+
45+
Adam Warski <[email protected]> adamw <[email protected]>
46+
Alex Snaps <[email protected]> <[email protected]>
47+
Andrea Boriero <[email protected]> <[email protected]>
48+
Andrej Golovnin <[email protected]> Andrej Golovnin <[email protected]>
49+
Andrig Miller <[email protected]> andrigtmiller <[email protected]>
50+
Andrig Miller <[email protected]> andy.miller <[email protected]>
51+
Barry LaFond <[email protected]> blafond <[email protected]>
52+
Boris Korogvich <[email protected]> VEINHORN <[email protected]>
53+
Brett Meyer <[email protected]> <[email protected]>
54+
Brett Meyer <[email protected]> brmeyer <[email protected]>
55+
Brett Meyer <[email protected]> brmeyer <[email protected]>
56+
Brian Stansberry <[email protected]> <[email protected]>
57+
Chris Cranford <[email protected]> <[email protected]>
58+
Chris Cranford <[email protected]> <[email protected]>
59+
Chris Cranford <[email protected]> Chris Canford <[email protected]>
60+
Chris Cranford <[email protected]> <[email protected]> Naros
61+
Chris Cranford <[email protected]> <[email protected]>
62+
Chris Cranford <[email protected]> cranforc <[email protected]>
63+
Christoph Dreis <[email protected]> ChristophDreis <[email protected]>
64+
Dave Repshas <[email protected]> drepshas <[email protected]>
65+
David M. Carr <[email protected]> davidmc24 <[email protected]>
66+
David M. Carr <[email protected]> dcarr <[email protected]>
67+
Eric Dalquist <[email protected]> edalquist <[email protected]>
68+
Erik-Berndt Scheper <[email protected]> <[email protected]>
69+
Gail Badner <[email protected]> Gail Badner <[email protected]>
70+
Gail Badner <[email protected]> <[email protected]>
71+
Gail Badner <[email protected]> gbadner <[email protected]>
72+
Galder Zamarreño <[email protected]> <[email protected]>
73+
Galder Zamarreño <[email protected]> <[email protected]>
74+
Galder Zamarreño <[email protected]> <[email protected]>
75+
Galder Zamarreño <[email protected]> <[email protected]>
76+
Galder Zamarreño <[email protected]> <[email protected]>
77+
Gavin King <[email protected]> <[email protected]>
78+
Gavin King <[email protected]> Gavin <[email protected]>
79+
Greg Luck <[email protected]> Greg Luck <[email protected]>
80+
Guillaume Smet <[email protected]> Guillaume Smet <[email protected]>
81+
Hardy Ferentschik <[email protected]> <[email protected]>
82+
Hardy Ferentschik <[email protected]> <[email protected]>
83+
Harsh Panchal <[email protected]> BOOTMGR <[email protected]>
84+
Hernán Chanfreau <[email protected]> hernan <[email protected]>
85+
Jaikiran Pai <[email protected]> Jaikiran <[email protected]>
86+
Jeremy Whiting <[email protected]> Jeremy Whiting <[email protected]>
87+
John O'Hara <[email protected]> johara <[email protected]>
88+
John O'Hara <[email protected]> <[email protected]>
89+
John O'Hara <[email protected]> JohnOhara <[email protected]>
90+
John O'Hara <[email protected]> John OHara <[email protected]>
91+
John Verhaeg <[email protected]> John Verhaeg <[email protected]>
92+
John Verhaeg <[email protected]> JPAV <[email protected]>
93+
Loïc LEFEVRE <[email protected]> LLEFEVRE <[email protected]>
94+
Luis Barreiro <[email protected]> barreiro <[email protected]>
95+
Lukasz Antoniak <[email protected]> lukasz-antoniak <[email protected]>
96+
Marco Belladelli <[email protected]> marco <[email protected]>
97+
Marco Belladelli <[email protected]> <[email protected]>
98+
Misty Stanley-Jones <[email protected]> misty <[email protected]>
99+
Misty Stanley-Jones <[email protected]> <mstanley@cheezel.(none)>
100+
Misty Stanley-Jones <[email protected]> mstanleyjones <[email protected]>
101+
Nathan Xu <[email protected]> <[email protected]>
102+
Nathan Xu <[email protected]> <[email protected]>
103+
Oliver Breidenbach <[email protected]> obr <[email protected]>
104+
Radim Vansa <[email protected]> rvansa <[email protected]>
105+
Sanne Grinovero <[email protected]> <[email protected]>
106+
Scott Marlow <[email protected]> Scott Marlow <[email protected]>
107+
Scott Marlow <[email protected]> smarlow <[email protected]>
108+
Simeon <[email protected]> simeonmalchev <[email protected]>
109+
Ståle W. Pedersen <[email protected]> <[email protected]>
110+
Steve Ebersole <[email protected]> <steve@apollo.(none)>
111+
Steve Ebersole <[email protected]> <steve@t510.(none)>
112+
Strong Liu <[email protected]> <[email protected]>
113+
Vlad Mihalcea <[email protected]> <[email protected]>
114+
Vlad Mihalcea <[email protected]> <[email protected]>
115+
Vlad Mihalcea <[email protected]> <Vlad Mihalcea>
116+
Vlad Mihalcea <[email protected]> <[email protected]>
117+
Yoann Rodière <[email protected]> Yoann Rodière <[email protected]>
118+
Yoann Rodière <[email protected]> Yoann Rodière <[email protected]>
119+

‎.release/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# The folder into which we checkout our release scripts into
2+
*

0 commit comments

Comments
 (0)