Merge branch 'main' into HHH-18829

Author: gavinking

build.gradle

@@ -39,6 +39,7 @@ plugins {
 
 apply from: file( 'gradle/module.gradle' )
 
+
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Release Task
 
@@ -61,19 +62,34 @@ task publish {
 			"themselves if they have any publish-related activities to perform"
 }
 
-ext {
-	if ( project.hasProperty( 'hibernatePublishUsername' ) ) {
-		if ( ! project.hasProperty( 'hibernatePublishPassword' ) ) {
-			throw new GradleException( "Should specify both `hibernatePublishUsername` and `hibernatePublishPassword` as project properties" );
-		}
+
+
+def ossrhUsername = extractPropertyOrSetting( "OSSRH_USER" )
+def ossrhPassword = extractPropertyOrSetting( "OSSRH_PASSWORD" )
+
+String extractPropertyOrSetting(String name) {
+	if ( project.hasProperty( name) ) {
+		return project.property( name )
+	}
+
+	def sysProp = System.getProperty( name )
+	if ( sysProp != null ) {
+		return sysProp
 	}
+
+	def envProp = System.getenv( name )
+	if ( envProp != null ) {
+		return envProp
+	}
+
+	return null
 }
 
 nexusPublishing {
 	repositories {
 		sonatype {
-			username = project.hasProperty( 'hibernatePublishUsername' ) ? project.property( 'hibernatePublishUsername' ) : null
-			password = project.hasProperty( 'hibernatePublishPassword' ) ? project.property( 'hibernatePublishPassword' ) : null
+			username = ossrhUsername
+			password = ossrhPassword
 		}
 	}
 }
@@ -82,26 +98,15 @@ gradle.taskGraph.addTaskExecutionGraphListener(
 		new TaskExecutionGraphListener() {
 			@Override
 			void graphPopulated(TaskExecutionGraph graph) {
-				String[] tasksToLookFor = [
-						'publish',
-						'publishToSonatype',
-						'publishAllPublicationsToSonatype',
-						'publishPublishedArtifactsPublicationToSonatypeRepository',
-						'publishRelocationArtifactsPublicationToSonatypeRepository',
-				]
-
-				for ( String taskToLookFor : tasksToLookFor ) {
-					if ( graph.hasTask( taskToLookFor ) ) {
-						// trying to publish - make sure the needed credentials are available
-
-						if ( project.property( 'hibernatePublishUsername' ) == null ) {
-							throw new RuntimeException( "`-PhibernatePublishUsername=...` not found" )
+				for ( final def task in graph.allTasks ) {
+					if ( task instanceof PublishToMavenRepository ) {
+						if ( ossrhUsername == null ) {
+							throw new RuntimeException( "OSSRH username not specified, but publishing was requested" )
 						}
-						if ( project.property( 'hibernatePublishPassword' ) == null ) {
-							throw new RuntimeException( "`-PhibernatePublishPassword=...` not found" )
+						if ( ossrhPassword == null ) {
+							throw new RuntimeException( "OSSRH password not specified, but publishing was requested" )
 						}
-
-						break;
+						break
 					}
 				}
 			}
@@ -139,6 +144,3 @@ idea {
 		name = "hibernate-orm"
 	}
 }
-
-
-

changelog.txt

@@ -3,6 +3,72 @@ Hibernate 6 Changelog
 
 Note: Please refer to JIRA to learn more about each issue.
 
+Changes in 7.0.0.Beta3 (December 05, 2024)
+------------------------------------------------------------------------------------------------------------------------
+
+https://hibernate.atlassian.net/projects/HHH/versions/32364
+
+** Bug
+    * [HHH-18912] - Fix ORM release process
+    * [HHH-18881] - In MySQL, array of dates are not converted correctly
+    * [HHH-18872] - ConcreteProxy type not restored from 2LC when loading a ManyToOne
+    * [HHH-18862] - Group by error due to subselect using foreign key reference instead of primary key in HQL query
+    * [HHH-18859] - slice operator and @ElementCollection
+    * [HHH-18851] - ArrayContainsArgumentTypeResolver wrongly infers array type for needle argument
+    * [HHH-18850] - createCountQuery with Hibernate 6.6.2
+    * [HHH-18848] - JAR for org.hibernate.orm:hibernate-scan-jandex:7.0.0.Beta2 at Maven Central
+    * [HHH-18842] - Regression: CollectionType.replace() breaks if target is PersistentCollection, but not instance of Collection (e.g. PersistentMap)
+    * [HHH-18832] - Bytecode enhancement skipped for entities with "compute-only" @Transient properties
+    * [HHH-18830] - extraneous SQL UPDATE statements for unowned collection with @OrderColumn
+    * [HHH-18826] - mappedBy validation in Processor
+    * [HHH-18765] - Error in the booleanarray_to_string auxiliary function 
+    * [HHH-18709] - CriteriaUpdate involving JSON field containing Map<String, Object> results in SemanticException
+    * [HHH-18705] - Hibernate processor creates bad TypedReferenceQuery when @Entity have name attribute
+    * [HHH-18692] - Hibernate attempts to close batched statements multiple times 
+    * [HHH-18629] - Inconsistent column alias generated while result class is used for placeholder
+    * [HHH-18610] - "SQLGrammarException: Unable to find column position by name:" when using Single Table Inheritance with a strict JDBC driver such as PostgreSQL
+    * [HHH-18583] - Joined + discriminator inheritance treat in where clause not restricting to subtype
+    * [HHH-18274] - Problems with generics in queries; proposed partial solution
+    * [HHH-18069] - NullPointerException when unioning partition results
+    * [HHH-17838] - @OneToOne relationship + @Embeddable keys + FetchType.LAZY fail in most recent version
+    * [HHH-16054] - JPA / Hibernate, duplicate pkey error when updating entity that is a subclass of a base class that uses IdClass for composite primary key
+    * [HHH-14119] - IN clause parameter padding not working for criteria query in conjunction with LiteralHandlingMode.BIND
+
+** Improvement
+    * [HHH-18875] - Stop using `Array.newInstance` in `org.hibernate.internal.util.collections.StandardStack`
+    * [HHH-18861] - Improve GitHub release announcement body for automated releases
+    * [HHH-18847] - Organize the org.hibernate.query.results package
+    * [HHH-18844] - Run preVerifyRelease task as part of h2 CI job
+    * [HHH-18841] - Make `_identifierMapper` property added for a IdClass synthetic
+    * [HHH-18840] - detect and report incorrect usage of @OrderColumn, @MapKeyColumn, and @MapKey
+    * [HHH-18683] - The method Metamodel#entity(String) should throw IllegalArgumentException for non-entities
+    * [HHH-18534] - Remove the org.hibernate.boot.models.categorize package
+    * [HHH-17246] - Guard against Sybase being configured for truncating trailing zeros.
+    * [HHH-16160] - XML aggregate support for more databases
+    * [HHH-14020] - Allow Hibernate Types to have access to ServiceRegistry during initialization
+    * [HHH-7913] - Catalog and schema replacement in <subselect> / @Subselect
+
+** New Feature
+    * [HHH-18644] - New and improved hibernate-maven-plugin
+
+** Remove Feature
+    * [HHH-18843] - remove deprecated @OrderBy annotation
+
+** Sub-task
+    * [HHH-18804] - Add XML aggregate support for HANA
+    * [HHH-18803] - Add XML aggregate support for DB2
+    * [HHH-18802] - Add XML aggregate support for SQL Server
+    * [HHH-18801] - Add XML aggregate support for Sybase ASE
+    * [HHH-18800] - Add XML aggregate support for PostgreSQL
+    * [HHH-18799] - Add XML aggregate support for Oracle
+
+** Task
+    * [HHH-18906] - Allow specifying UnsupportedEnhancementStrategy for Hibernate testing
+    * [HHH-18866] - Fix more failing tests on CockroachDB
+    * [HHH-18854] - Changes for Hibernate Reactive 3.0 integration
+    * [HHH-18678] - Use specific tasks for CI builds
+
+
 Changes in 7.0.0.Beta2 (November 13, 2024)
 ------------------------------------------------------------------------------------------------------------------------
 

ci/release/Jenkinsfile

@@ -53,6 +53,9 @@ def checkoutReleaseScripts() {
 	}
 }
 
+File findReleaseNotes() {
+}
+
 // --------------------------------------------
 // Pipeline
 
@@ -148,10 +151,6 @@ pipeline {
 					env.RELEASE_VERSION = releaseVersion.toString()
 					env.DEVELOPMENT_VERSION = developmentVersion.toString()
 
-                    def notesFile = new File( "release_notes.md" )
-                    assert notesFile.exists
-                    env.SCRIPT_OPTIONS = " --notes=${notesFile.absolutePath}"
-
 					if ( params.RELEASE_DRY_RUN ) {
 					    env.SCRIPT_OPTIONS += " -d"
 					}
@@ -217,7 +216,7 @@ pipeline {
 								withEnv([
 										"DISABLE_REMOTE_GRADLE_CACHE=true"
 								]) {
-									sh ".release/scripts/publish.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH}"
+									sh ".release/scripts/publish.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.DEVELOPMENT_VERSION} ${env.GIT_BRANCH} ${env.SCRIPT_OPTIONS}"
 								}
 							}
 						}
@@ -244,7 +243,7 @@ pipeline {
 											extensions: [],
 											userRemoteConfigs: [[credentialsId: 'ed25519.Hibernate-CI.github.com', url: 'https://github.com/hibernate/hibernate.org.git']]
 									)
-									sh "../scripts/website-release.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION}"
+									sh "../scripts/website-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.SCRIPT_OPTIONS} "
 								}
 							}
 						}
@@ -256,8 +255,17 @@ pipeline {
 			steps {
 				script {
 					checkoutReleaseScripts()
+
+                    def notesFiles = findFiles(glob: 'release_notes.md')
+                    if ( notesFiles.length < 1 ) {
+                        throw new IllegalStateException( "Could not locate `release_notes.md`" )
+                    }
+                    if ( notesFiles.length > 1 ) {
+                        throw new IllegalStateException( "Located more than 1 `release_notes.md`" )
+                    }
+
 					withCredentials([string(credentialsId: 'Hibernate-CI.github.com', variable: 'GITHUB_API_TOKEN')]) {
-						sh ".release/scripts/github-release.sh ${env.SCRIPT_OPTIONS} ${env.PROJECT} ${env.RELEASE_VERSION}"
+						sh ".release/scripts/github-release.sh ${env.PROJECT} ${env.RELEASE_VERSION} ${env.SCRIPT_OPTIONS} --notes=${notesFiles[0].path}"
 					}
 				}
 			}

documentation/documentation.gradle

@@ -52,8 +52,6 @@ configurations {
 	agroal
 	c3p0
 	hikaricp
-	proxool
-	vibur
 
 	jcache
 
@@ -72,8 +70,6 @@ configurations {
 		extendsFrom agroal
 		extendsFrom c3p0
 		extendsFrom hikaricp
-		extendsFrom proxool
-		extendsFrom vibur
 		extendsFrom jcache
 		extendsFrom jpamodelgen
 	}
@@ -133,9 +129,7 @@ dependencies {
 	reportAggregation project(':hibernate-hikaricp')
 	reportAggregation project(':hibernate-jcache')
 	reportAggregation project(':hibernate-micrometer')
-	reportAggregation project(':hibernate-proxool')
 	reportAggregation project(':hibernate-spatial')
-	reportAggregation project(':hibernate-vibur')
 	reportAggregation project(':hibernate-ant')
 	reportAggregation project(':hibernate-maven-plugin')
 	reportAggregation project(':hibernate-processor')
@@ -163,12 +157,6 @@ dependencies {
 	hikaricp project( ':hibernate-hikaricp' )
 	javadocSources project( path: ':hibernate-hikaricp', configuration: 'javadocSources' )
 
-	proxool project( ':hibernate-proxool' )
-	javadocSources project( path: ':hibernate-proxool', configuration: 'javadocSources' )
-
-	vibur project( ':hibernate-vibur' )
-	javadocSources project( path: ':hibernate-vibur', configuration: 'javadocSources' )
-
 	jcache project( ':hibernate-jcache' )
 	javadocSources project( path: ':hibernate-jcache', configuration: 'javadocSources' )
 
@@ -565,12 +553,6 @@ settingsDocumentation {
 			description = "Settings related to integrating with the C3P0 Connection pool"
 			settingsClassName "org.hibernate.cfg.C3p0Settings"
 		}
-		proxool {
-			explicitPosition = 5
-			summary = "Proxool Connection Pool Settings"
-			description = "Settings related to integrating with the Proxool Connection pool"
-			settingsClassName "org.hibernate.cfg.ProxoolSettings"
-		}
 		transaction {
 			explicitPosition = 6
 			summary = "Transaction Environment Settings"

documentation/src/main/asciidoc/introduction/Tuning.adoc

@@ -33,7 +33,7 @@ the connection pool.
 === Tuning the connection pool
 
 The connection pool built in to Hibernate is suitable for testing, but isn't intended for use in production.
-Instead, Hibernate supports a range of different connection pools, including our favorite, Agroal.
+Instead, Hibernate supports several different connection pools, including our favorite, Agroal.
 
 To select and configure Agroal, you'll need to set some extra configuration properties, in addition to the settings we already saw in <<basic-configuration-settings>>.
 Properties with the prefix `hibernate.agroal` are passed through to Agroal:
@@ -48,7 +48,7 @@ hibernate.agroal.reapTimeout PT10s
 ----
 
 As long as you set at least one property with the prefix `hibernate.agroal`, the `AgroalConnectionProvider` will be selected automatically.
-There are many to choose from:
+There are many to choose from, as enumerated by link:{doc-javadoc-url}/org/hibernate/cfg/AgroalSettings.html[`AgroalSettings`]:
 
 .Settings for configuring Agroal
 [%breakable,cols="37,~"]
@@ -72,10 +72,13 @@ The following settings are common to all connection pools supported by Hibernate
 .Common settings for connection pools
 [%breakable,cols="37,~"]
 |===
-| `hibernate.connection.autocommit` | The default autocommit mode
-| `hibernate.connection.isolation` | The default transaction isolation level
+| link:{doc-javadoc-url}/org/hibernate/cfg/JdbcSettings.html#AUTOCOMMIT[`hibernate.connection.autocommit`] | The default autocommit mode
+| link:{doc-javadoc-url}/org/hibernate/cfg/JdbcSettings.html#ISOLATION[`hibernate.connection.isolation`] | The default transaction isolation level
 |===
 
+A popular alternative to Agroal is HikariCP.
+Its setting are enumerated by link:{doc-javadoc-url}/org/hibernate/cfg/HikariCPSettings.html[`HikariCPSettings`].
+
 .Container-managed datasources
 ****
 In a container environment, you usually don't need to configure a connection pool through Hibernate.

documentation/src/main/asciidoc/querylanguage/Expressions.adoc

@@ -841,6 +841,7 @@ Naturally, there are a good number of functions for working with strings.
 | `replace()` | Replace every occurrence of a pattern in a string | `replace(str, patt, rep)` | ✔ / ✖
 | `repeat()` | Concatenate a string with itself multiple times | `repeat(str, times)` | ✖ / ✖
 | `collate()` | Select a collation | `collate(p.name as collation)` | ✖ / ✖
+| `hex()` | Encode a binary value as a hexadecimal string | `hex(image.bytes)` | ✖ / ✖
 |===
 
 Let's take a closer look at just some of these.
@@ -1174,8 +1175,8 @@ Finally, the following functions evaluate the id, version, or natural id of an e
 |===
 | Function | Purpose | JPA standard
 
-| `id()` | The value of the entity `@Id` attribute. | ✖
-| `version()` | The value of the entity `@Version` attribute. | ✖
+| `id()` | The value of the entity `@Id` attribute. | ✔
+| `version()` | The value of the entity `@Version` attribute. | ✔
 | `naturalid()` | The value of the entity `@NaturalId` attribute. | ✖
 | `fk()` | The value of the foreign key column mapped by a `@ManyToOne` (or logical `@OneToOne`) association.
 Useful with associations annotated `@NotFound`. | ✖
@@ -1207,6 +1208,23 @@ However, we note that the following language constructs work with arrays, and ar
 | `array includes subarray` | Determine if the elements of one array include all the elements of a second array
 |===
 
+[[functions-hash]]
+=== Hash functions
+
+The following functions work on most supported platforms:
+
+[[hash-functions]]
+[cols="12,~,^15"]
+|===
+| Function | Purpose | JPA standard
+
+| `sha()` | The SHA256 hash of a string. | ✖
+| `md5()` | The MD5 hash of a string. | ✖
+|===
+
+These functions accept a string and return `byte[]`.
+The return value is compatible with the byte array produced by Java's `MessageDigest`.
+
 [[embedding-sql]]
 ==== Embedding SQL expressions
 

documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc

@@ -52,8 +52,6 @@ transitive dependencies based on the features being used or not.
 |hibernate-agroal| Support for https://agroal.github.io/[Agroal] connection pooling
 |hibernate-c3p0| Support for https://www.mchange.com/projects/c3p0/[C3P0] connection pooling
 |hibernate-hikaricp| Support for https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling
-|hibernate-vibur| Support for https://www.vibur.org/[Vibur DBCP] connection pooling
-|hibernate-proxool| Support for https://proxool.sourceforge.net/[Proxool] connection pooling
 |hibernate-ucp| Support for https://docs.oracle.com/en/database/oracle/oracle-database/23/jjucp/intro.html[Universal Connection Pool] connection pooling
 |hibernate-jcache| Integration with https://jcp.org/en/jsr/detail?id=107$$[JCache], allowing any compliant implementation as a second-level cache provider
 |hibernate-graalvm| Experimental extension to make it easier to compile applications as a https://www.graalvm.org/[GraalVM] native image