Merge branch 'main' into HHH-19555

Author: gavinking

.github/dependabot.yml

@@ -69,6 +69,7 @@ updates:
           - "org.hsqldb:hsqldb"
           - "org.apache.derby*"
           - "org.postgresql:*"
+          - "com.enterprisedb:*"
           - "com.mysql:mysql-connector-j"
           - "org.mariadb.jdbc:mariadb-java-client"
           - "com.oracle.database.*"

.github/hibernate-github-bot.yml

@@ -68,6 +68,16 @@ develocity:
 licenseAgreement:
   enabled: true
   ignore:
-    # See the `build-dependencies` group in the Dependabot's configuration file
     - user: dependabot[bot]
       titlePattern: "Bump.*"
+    # Members of this team already agreed to both LGPL and ASL2 for all their contributions.
+    - team:
+          name: license-agreement
+          organization: hibernate
+      titlePattern: ".*"
+branches:
+  enabled: true
+  label: "%s"
+  ignore:
+    - user: dependabot[bot]
+      titlePattern: ".*"

.github/workflows/ci.yml

@@ -142,39 +142,30 @@ jobs:
       - name: Omit produced artifacts from build cache
         run: ./ci/before-cache.sh
 
-  # Job for builds on Atlas (Oracle) infrastructure.
+  # Job for builds on Oracle TP infrastructure.
   # This is untrusted, even for pushes, see below.
-  atlas:
+  otp:
     permissions:
       contents: read
     name: GraalVM 21 - ${{matrix.rdbms}}
-    #    runs-on: ubuntu-latest
-    runs-on: [ self-hosted, Linux, X64, OCI ]
+    runs-on: [ self-hosted, Linux, X64, OracleTestPilot ]
     strategy:
       fail-fast: false
       matrix:
         include:
-          - rdbms: oracle_atps
-          - rdbms: oracle_db19c
-          - rdbms: oracle_db21c
-          - rdbms: oracle_db23c
+          #- rdbms: autonomous-transaction-processing-serverless
+          - rdbms: base-database-service-19c
+          - rdbms: base-database-service-21c
+          - rdbms: base-database-service-23ai
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - name: Reclaim disk space and sanitize user home
-        run: .github/ci-prerequisites-atlas.sh
-      - name: Start database
-        env:
-          RDBMS: ${{ matrix.rdbms }}
-          RUNID: ${{ github.run_number }}
-        run: ci/database-start.sh
       - name: Set up Java 21
         uses: graalvm/setup-graalvm@aafbedb8d382ed0ca6167d3a051415f20c859274 # v1.2.8
         with:
           distribution: 'graalvm'
           java-version: '21'
-
       - name: Generate cache key
         id: cache-key
         run: |
@@ -205,7 +196,7 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
       - name: Restore Maven/Gradle Dependency/Dist Caches
         uses: actions/cache/restore@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
-        # if it a pull request, we restore the cache but we don't save it
+        # if it is a pull request, we restore the cache but we don't save it
         if: github.event_name == 'pull_request'
         with:
           path: |
@@ -218,17 +209,35 @@ jobs:
             ${{ steps.cache-key.outputs.buildtool-monthly-branch-cache-key }}-
             ${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
 
+      - id: create_database
+        uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+        with:
+          oci-service: ${{ matrix.rdbms }}
+          action: create
+          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4
+
       - name: Run build script
         env:
           RDBMS: ${{ matrix.rdbms }}
           RUNID: ${{ github.run_number }}
-          # These runners have no HOME variable set by default, we need to explicitly set it to make the build work
-          HOME: /root
+          TESTPILOT_CONNECTION_STRING_SUFFIX: ${{ steps.create_database.outputs.connection_string_suffix }}
+          TESTPILOT_PASSWORD: ${{ steps.create_database.outputs.database_password }}
+          API_HOST: ""
+          TESTPILOT_CLIENT_ID: ""
+          TESTPILOT_TOKEN: ""
           # Needed for TFO (TCP fast open)
-          LD_PRELOAD: /home/opc/libtfojdbc1.so
-          LD_LIBRARY_PATH: /home/opc
+          LD_PRELOAD: /home/ubuntu/libtfojdbc1.so
+          LD_LIBRARY_PATH: /home/ubuntu
         run: ./ci/build-github.sh
         shell: bash
+
+      - uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
+        if: always()
+        with:
+          oci-service: ${{ matrix.rdbms }}
+          action: delete
+          user: hibernate_orm_test_1,hibernate_orm_test_2,hibernate_orm_test_3,hibernate_orm_test_4
+
       # Upload build scan data.
       # The actual publishing must be done in a separate job (see ci-report.yml).
       # We don't write to the remote cache as that would be unsafe.

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 Contributions from the community are essential in keeping Hibernate (and any Open Source
 project really) strong and successful.  
 
-# Legal
+## Legal
 
 All original contributions to Hibernate are licensed under the
 [Apache License version 2.0 (Apache-2.0)](https://www.apache.org/licenses/LICENSE-2.0.txt),
@@ -24,6 +24,12 @@ by sending a pull request to the project's GitHub repository,
 listing at least one relevant contribution in the pull request description.
 Note: one-liner or repetitive patches may not be sufficient to claim copyright.
 
+### Compliance with Laws and Regulations
+
+All contributions must comply with applicable laws and regulations, including U.S. export control and sanctions restrictions.
+For background, see the Linux Foundation’s guidance:
+[Navigating Global Regulations and Open Source: US OFAC Sanctions](https://www.linuxfoundation.org/blog/navigating-global-regulations-and-open-source-us-ofac-sanctions).
+
 ## Guidelines
 
 While we try to keep requirements for contributing to a minimum, there are a few guidelines 

Jenkinsfile

@@ -46,7 +46,6 @@ stage('Configure') {
 		// We want to enable preview features when testing newer builds of OpenJDK:
 		// even if we don't use these features, just enabling them can cause side effects
 		// and it's useful to test that.
-		new BuildEnvironment( testJdkVersion: '23', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
 		new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
 		new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview', additionalOptions: '-PskipJacoco=true' ),
 		// The following JDKs aren't supported by Hibernate ORM out-of-the box yet:
@@ -158,16 +157,12 @@ stage('Build') {
 									state[buildEnv.tag]['containerName'] = "edb"
 									break;
 								case "sybase_jconn":
-									docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
-										docker.image('nguoianphu/docker-sybase').pull()
-									}
+									docker.image('nguoianphu/docker-sybase').pull()
 									sh "./docker_db.sh sybase"
 									state[buildEnv.tag]['containerName'] = "sybase"
 									break;
 								case "cockroachdb":
-									docker.withRegistry('https://index.docker.io/v1/', 'hibernateci.hub.docker.com') {
-										docker.image('cockroachdb/cockroach:v23.1.12').pull()
-									}
+									docker.image('cockroachdb/cockroach:v23.1.12').pull()
 									sh "./docker_db.sh cockroachdb"
 									state[buildEnv.tag]['containerName'] = "cockroach"
 									break;

MAINTAINERS.md

@@ -98,9 +98,7 @@ In any case, before the release:
 
 #### Performing the release
 
-Once you trigger the CI job, it automatically pushes artifacts to the
-[OSSRH Maven Repository](https://repo1.maven.org/maven2/org/hibernate/orm/),
-and the documentation to [docs.jboss.org](https://docs.jboss.org/hibernate/orm/).
+Trigger the CI release job to automatically publish artifacts and documentation...
 
 * Do *not* mark the Jira Release as "released" or close issues,
   the release job triggers Jira automation that does it for you.
@@ -116,18 +114,6 @@ and the documentation to [docs.jboss.org](https://docs.jboss.org/hibernate/orm/)
 
 After the job succeeds:
 
-* Release the artifacts on the [OSSRH repository manager](https://oss.sonatype.org/#stagingRepositories).
-  * Log into Nexus. The credentials can be found on Bitwarden; ask a teammate if you don't have access.
-  * Click "staging repositories" to the left.
-  * Examine your staging repository: check that all expected artifacts are there.
-  * If necessary (that's very rare), test the release in the staging repository.
-    You can drop the staging repo if there is a problem,
-    but you'll need to revert the commits pushed during the release.
-  * If everything is ok, select the staging repository and click the "Release" button.
-    * For branches with automated releases (e.g. 6.6) the "release repository" will happen automatically.
-      to enable/disable the automatic release of the staging repository update the [jreleaser.yml](jreleaser.yml) file,
-      in particular change the `deploy.maven.nexus2.maven-central.releaseRepository` to `true`/`false`.
-
 * Update [hibernate.org](https://github.com/hibernate/hibernate.org) as necessary:
   * If it is a new major or minor release (new "series"):
     * Add a `_data/projects/orm/releases/<series>/series.yml` file,
@@ -141,7 +127,7 @@ After the job succeeds:
     make sure to adjust the `status`/`displayed` attributes of the `series.yml` file of the old series.
   * Push to the production branch.
 * Check that the artifacts are available on Maven Central:
-  https://repo1.maven.org/maven2/org/hibernate/orm/hibernate-core/.
+  https://central.sonatype.com/artifact/org.hibernate.orm/hibernate-core.
   They should appear after a few minutes, sometimes a few hours.
 * Make sure a GitHub release got created and that everything looks ok.
 

README.adoc

@@ -4,6 +4,7 @@ image:https://img.shields.io/maven-central/v/org.hibernate.orm/hibernate-core.sv
 image:https://img.shields.io/jenkins/build?jobUrl=https%3A%2F%2Fci.hibernate.org%2Fjob%2Fhibernate-orm-pipeline%2Fjob%2Fmain%2F&style=for-the-badge[Build Status,link=https://ci.hibernate.org/job/hibernate-orm-pipeline/job/main/]
 image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?style=for-the-badge&logo=gradle[Develocity,link=https://develocity.commonhaus.dev/scans?search.rootProjectNames=Hibernate%20ORM]
 image:https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/jvm-repo-rebuild/reproducible-central/master/content/org/hibernate/orm/hibernate-core/badge.json&style=for-the-badge[Reproducible Builds,link=https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/hibernate/orm/hibernate-core/README.md]
+image:https://testpilot.oracle.com/ords/testpilot/badges/github/hibernate/hibernate-orm[Oracle Test Pilot,link=https://testpilot.oracle.com/]
 
 Hibernate ORM is a powerful object/relational mapping solution for Java, and makes it easy to develop persistence logic for applications, libraries, and frameworks.
 

build.gradle

@@ -19,12 +19,12 @@ buildscript {
 plugins {
 	id "local.module"
 
-	id "org.hibernate.build.version-injection" version "2.0.0" apply false
+	id "org.hibernate.build.version-injection" version "2.1.0" apply false
 	id 'org.hibernate.orm.database-service' apply false
 	id 'biz.aQute.bnd' version '7.1.0' apply false
 
 	id "com.diffplug.spotless" version "7.0.4"
-	id 'org.checkerframework' version '0.6.55'
+	id 'org.checkerframework' version '0.6.56'
 	id 'org.hibernate.orm.build.jdks'
 
 	id 'io.github.gradle-nexus.publish-plugin' version '2.0.0'