Skip to content

Commit 6978ae7

Browse files
authored
Merge branch 'main' into HHH-19542-embeddable-property-order
2 parents d4d96d2 + f0792cc commit 6978ae7

File tree

1,522 files changed

+15141
-11195
lines changed

Some content is hidden

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

1,522 files changed

+15141
-11195
lines changed

.github/dependabot.yml

Lines changed: 125 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,6 @@ registries:
66
username: dummy # Required by dependabot
77
password: dummy # Required by dependabot
88
updates:
9-
- package-ecosystem: "gradle"
10-
directory: "/"
11-
allow:
12-
- dependency-name: "com.gradle*"
13-
registries:
14-
- gradle-plugin-portal
15-
schedule:
16-
interval: "weekly"
179
- package-ecosystem: github-actions
1810
directory: "/"
1911
schedule:
@@ -25,3 +17,128 @@ updates:
2517
allow:
2618
- dependency-name: "actions/*"
2719
- dependency-name: "redhat-actions/*"
20+
- package-ecosystem: "gradle"
21+
directory: "/"
22+
registries:
23+
- gradle-plugin-portal
24+
schedule:
25+
interval: "weekly"
26+
day: "wednesday"
27+
open-pull-requests-limit: 20
28+
groups:
29+
# These are used in tooling we publish (Gradle, Ant, Maven plugins)
30+
# and thus must be treated as runtime dependencies,
31+
# which cannot be included in the build-dependencies group below.
32+
tooling-dependencies:
33+
patterns:
34+
# Note: Gradle tooling dependencies seem to be tied to the version of Gradle we use for building.
35+
- "org.apache.ant*"
36+
- "org.apache.maven:maven-plugin-api"
37+
- "org.apache.maven:maven-project"
38+
- "org.apache.maven.shared:file-management"
39+
- "org.apache.maven.plugin-tools:maven-plugin-annotations"
40+
# This group combines all build-only dependencies. Published artifacts do not depend on them.
41+
# Grouping such dependencies will make Dependabot create PRs with a branch name
42+
# following the pattern (`dependabot/maven/build-dependencies-.*`)
43+
# and with a title like `Bump the build-dependencies group with 8 updates` that we can easily
44+
# use for Hibernate Bot rules.
45+
build-dependencies:
46+
patterns:
47+
# Gradle plugins:
48+
- "com.gradle*"
49+
- "org.moditect*"
50+
- "de.thetaphi*"
51+
- "org.gradlex*"
52+
- "org.hibernate.build*"
53+
- "org.hibernate.orm.build*"
54+
- "org.hibernate.orm.database-service*"
55+
- "org.hibernate.orm.antlr*"
56+
- "io.github.gradle-nexus*"
57+
- "biz.aQute.bnd*"
58+
- "org.checkerframework*"
59+
- "org.jetbrains.gradle*"
60+
- "com.dorongold*"
61+
- "org.asciidoctor*"
62+
- "com.diffplug.spotless*"
63+
# Local build plugin dependencies:
64+
- "org.apache.maven*"
65+
- "org.apache.httpcomponents*"
66+
# DB drivers:
67+
- "com.h2database:h2"
68+
- "org.orbisgis:h2gis"
69+
- "org.hsqldb:hsqldb"
70+
- "org.apache.derby*"
71+
- "org.postgresql:*"
72+
- "com.mysql:mysql-connector-j"
73+
- "org.mariadb.jdbc:mariadb-java-client"
74+
- "com.oracle.database.*"
75+
- "com.microsoft.sqlserver:mssql-jdbc"
76+
- "com.ibm.db2:jcc"
77+
- "com.sap.cloud.db.jdbc:ngdbc"
78+
- "net.sourceforge.jtds:jtds"
79+
- "com.ibm.informix:jdbc"
80+
- "org.firebirdsql.jdbc:jaybird"
81+
- "com.altibase:altibase-jdbc"
82+
# Other test dependencies
83+
- "org.apache.groovy:groovy-jsr223" # used for scripting maven plugin
84+
- "org.apache.commons:commons-lang3" # used in hibernate-search-util-common tests
85+
- "org.apache.commons:commons-math3" # used to solve dependency convergence for Wiremock
86+
- "org.openjdk.jmh:*" # performance testing dependency
87+
- "com.google.guava:guava" # Guava is used in our test utils
88+
- "org.asciidoctor:*" # Asciidoctor is used for rendering the documentation
89+
- "org.jboss.marshalling:jboss-marshalling" # JBeret IT dependency
90+
- "org.wildfly.security:wildfly-security-manager" # JBeret IT dependency
91+
- "org.springframework.boot:*" # Spring is only for ITs
92+
- "io.agroal:agroal-spring-boot-starter" # part of Spring dependencies, is only for ITs
93+
- "dev.snowdrop:narayana-spring-boot-starter" # part of Spring dependencies, is only for ITs
94+
- "org.mockito:*"
95+
- "org.hamcrest:*"
96+
- "org.apache.logging.log4j:*"
97+
- "org.assertj:*"
98+
- "org.jsoup:*"
99+
- "org.junit*"
100+
- "org.jboss.weld.se:*"
101+
- "org.jboss.narayana.*:*"
102+
- "org.wildfly.transaction:*"
103+
- "org.jboss:jboss-transaction-spi"
104+
- "org.jboss.shrinkwrap*"
105+
- "org.jboss.byteman*"
106+
hibernate:
107+
patterns:
108+
- "org.hibernate*"
109+
jakarta:
110+
patterns:
111+
- "jakarta.*"
112+
- "org.glassfish*"
113+
- "org.eclipse:yasson"
114+
ignore:
115+
# Avoid non-patch updates for complex dependencies and their implementation, even if we only use them for tests.
116+
- dependency-name: "org.hibernate*"
117+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
118+
- dependency-name: "jakarta.*"
119+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
120+
- dependency-name: "org.jboss.narayana*"
121+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
122+
- dependency-name: "org.jboss.weld*"
123+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
124+
- dependency-name: "org.wildfly*"
125+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
126+
- dependency-name: "org.glassfish*"
127+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
128+
- dependency-name: "org.eclipse:yasson"
129+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
130+
- dependency-name: "org.apache.maven*"
131+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
132+
- dependency-name: "org.apache.ant*"
133+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
134+
# Avoid non-patch updates for JUnit, because it is exposed in hibernate-testing,
135+
# which contains @BytecodeEnhanced, which is very sensitive to internal changes in JUnit.
136+
- dependency-name: "org.junit*"
137+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
138+
# Sticking to SLF4J 1.x for now since later versions require upgrading providers
139+
# (Log4j, ... see https://www.slf4j.org/faq.html#changesInVersion200),
140+
# and also because we only need this dependency for Maven,
141+
# which is currently still on SLF4J 1.x
142+
# (see https://central.sonatype.com/artifact/org.apache.maven/maven-embedder/3.9.9/dependencies)
143+
- dependency-name: "org.slf4j:*"
144+
update-types: ["version-update:semver-major"]

.github/hibernate-github-bot.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
jira:
33
projectKey: "HHH"
44
insertLinksInPullRequests: true
5+
ignore:
6+
# See the `build-dependencies` group in Dependabot's configuration file
7+
- user: dependabot[bot]
8+
titlePattern: "Bump.*the (build-dependencies|workflow-actions) group.*+"
59
ignoreFiles:
610
# Git
711
- ".git*"
@@ -63,3 +67,7 @@ develocity:
6367
replacement: "" # Just remove these tags
6468
licenseAgreement:
6569
enabled: true
70+
ignore:
71+
# See the `build-dependencies` group in the Dependabot's configuration file
72+
- user: dependabot[bot]
73+
titlePattern: "Bump.*"

.github/workflows/ci-report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
persist-credentials: false
2323
ref: ${{ github.ref }}
2424
- name: Set up JDK
25-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
25+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
2626
with:
2727
distribution: 'temurin'
2828
java-version: '21'
@@ -38,7 +38,7 @@ jobs:
3838
echo "buildtool-monthly-branch-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}" >> $GITHUB_OUTPUT
3939
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
4040
- name: Restore Maven/Gradle Dependency/Dist Caches
41-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
41+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4242
with:
4343
path: |
4444
~/.m2/repository/
@@ -52,7 +52,7 @@ jobs:
5252
5353
- name: Download GitHub Actions artifacts for the Develocity build scans
5454
id: downloadBuildScan
55-
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8
55+
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
5656
with:
5757
pattern: build-scan-data-*
5858
github-token: ${{ github.token }}

.github/workflows/ci.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,18 @@ name: GH Actions CI
33
on:
44
push:
55
branches:
6+
# Pattern order matters: the last matching inclusion/exclusion wins
67
- 'main'
8+
# We don't want to run CI on branches for dependabot, just on the PR.
9+
- '!dependabot/**'
710
pull_request:
811
branches:
912
- 'main'
13+
# Ignore dependabot PRs that are not just about build dependencies or workflows;
14+
# we'll reject such PRs and send one ourselves.
15+
- '!dependabot/**'
16+
- 'dependabot/maven/build-dependencies-**'
17+
- 'dependabot/github_actions/workflow-actions-**'
1018

1119
permissions: { } # none
1220

@@ -56,7 +64,7 @@ jobs:
5664
RDBMS: ${{ matrix.rdbms }}
5765
run: ci/database-start.sh
5866
- name: Set up Java 21
59-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
67+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
6068
with:
6169
distribution: 'temurin'
6270
java-version: '21'
@@ -73,7 +81,7 @@ jobs:
7381
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
7482
- name: Cache Maven/Gradle Dependency/Dist Caches
7583
id: cache-maven
76-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
84+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
7785
# if it's not a pull request, we restore and save the cache
7886
if: github.event_name != 'pull_request'
7987
with:
@@ -90,7 +98,7 @@ jobs:
9098
${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
9199
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
92100
- name: Restore Maven/Gradle Dependency/Dist Caches
93-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
101+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
94102
# if it a pull request, we restore the cache but we don't save it
95103
if: github.event_name == 'pull_request'
96104
with:
@@ -118,14 +126,14 @@ jobs:
118126
# The actual publishing must be done in a separate job (see ci-report.yml).
119127
# We don't write to the remote cache as that would be unsafe.
120128
- name: Upload GitHub Actions artifact for the Develocity build scan
121-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
129+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
122130
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
123131
with:
124132
name: build-scan-data-${{ matrix.rdbms }}
125133
path: ~/.gradle/build-scan-data
126134

127135
- name: Upload test reports (if Gradle failed)
128-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
136+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
129137
if: failure()
130138
with:
131139
name: test-reports-java11-${{ matrix.rdbms }}
@@ -179,7 +187,7 @@ jobs:
179187
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
180188
- name: Cache Maven/Gradle Dependency/Dist Caches
181189
id: cache-maven
182-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
190+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
183191
# if it's not a pull request, we restore and save the cache
184192
if: github.event_name != 'pull_request'
185193
with:
@@ -196,7 +204,7 @@ jobs:
196204
${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
197205
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
198206
- name: Restore Maven/Gradle Dependency/Dist Caches
199-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
207+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
200208
# if it a pull request, we restore the cache but we don't save it
201209
if: github.event_name == 'pull_request'
202210
with:
@@ -226,13 +234,13 @@ jobs:
226234
# We don't write to the remote cache as that would be unsafe.
227235
# That's even on push, because we do not trust Atlas runners to hold secrets: they are shared infrastructure.
228236
- name: Upload GitHub Actions artifact for the Develocity build scan
229-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
237+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
230238
if: "${{ !cancelled() }}"
231239
with:
232240
name: build-scan-data-${{ matrix.rdbms }}
233241
path: ~/.gradle/build-scan-data
234242
- name: Upload test reports (if Gradle failed)
235-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
243+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
236244
if: failure()
237245
with:
238246
name: test-reports-java11-${{ matrix.rdbms }}
@@ -254,7 +262,7 @@ jobs:
254262
- name: Reclaim disk space and sanitize user home
255263
run: .github/ci-prerequisites-atlas.sh
256264
- name: Set up Java 21
257-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
265+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
258266
with:
259267
distribution: 'temurin'
260268
java-version: '21'
@@ -271,7 +279,7 @@ jobs:
271279
echo "buildtool-cache-key=${ROOT_CACHE_KEY}-${CURRENT_MONTH}-${CURRENT_BRANCH}-${CURRENT_DAY}" >> $GITHUB_OUTPUT
272280
- name: Cache Maven/Gradle Dependency/Dist Caches
273281
id: cache-maven
274-
uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
282+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
275283
# if it's not a pull request, we restore and save the cache
276284
if: github.event_name != 'pull_request'
277285
with:
@@ -288,7 +296,7 @@ jobs:
288296
${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
289297
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
290298
- name: Restore Maven/Gradle Dependency/Dist Caches
291-
uses: actions/cache/restore@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
299+
uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
292300
# if it a pull request, we restore the cache but we don't save it
293301
if: github.event_name == 'pull_request'
294302
with:
@@ -314,14 +322,14 @@ jobs:
314322
# The actual publishing must be done in a separate job (see ci-report.yml).
315323
# We don't write to the remote cache as that would be unsafe.
316324
- name: Upload GitHub Actions artifact for the Develocity build scan
317-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
325+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
318326
if: "${{ github.event_name == 'pull_request' && !cancelled() }}"
319327
with:
320328
name: build-scan-data-sca
321329
path: ~/.gradle/build-scan-data
322330

323331
- name: Upload test reports (if Gradle failed)
324-
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
332+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
325333
if: failure()
326334
with:
327335
name: test-reports-java11-sca

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
steps:
3838

3939
- name: Set up JDK
40-
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
40+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
4141
with:
4242
distribution: 'temurin'
4343
java-version: '21'

AUTHORS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# Corporate contributors
66

77
Red Hat, Inc.
8+
Oracle, Corporation.
89

910
# Individual contributors
1011

0 commit comments

Comments
 (0)