Merge branch 'main' into try-something

Author: gavinking

AUTHORS.txt

@@ -5,6 +5,7 @@
 # Corporate contributors
 
 Red Hat, Inc.
+Oracle, Corporation.
 
 # Individual contributors
 

Jenkinsfile

@@ -40,18 +40,20 @@ stage('Configure') {
 // Don't build with HANA by default, but only do it nightly until we receive a 3rd instance
 // 		new BuildEnvironment( dbName: 'hana_cloud', dbLockableResource: 'hana-cloud', dbLockResourceAsHost: true ),
 		new BuildEnvironment( node: 's390x' ),
-		// We build with JDK 21, but produce Java 17 bytecode, so we test with JDK 17, to be sure everything works.
-		new BuildEnvironment( testJdkVersion: '17' ),
+		// We generally build with JDK 21, but our baseline is Java 17, so we test with JDK 17, to be sure everything works.
+		// Here we even compile the main code with JDK 17, to be sure no JDK 18+ classes are depended on.
+		new BuildEnvironment( mainJdkVersion: '17', testJdkVersion: '17' ),
 		// 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' ),
-		new BuildEnvironment( testJdkVersion: '24', testJdkLauncherArgs: '--enable-preview' ),
+		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:
 		// they require the use of -Dnet.bytebuddy.experimental=true.
 		// Make sure to remove that argument as soon as possible
 		// -- generally that requires upgrading bytebuddy after the JDK goes GA.
-		new BuildEnvironment( testJdkVersion: '25', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true' )
+		new BuildEnvironment( testJdkVersion: '26', testJdkLauncherArgs: '--enable-preview -Dnet.bytebuddy.experimental=true', additionalOptions: '-PskipJacoco=true' )
 	];
 
 	if ( env.CHANGE_ID ) {
@@ -101,13 +103,19 @@ stage('Build') {
 	Map<String, Closure> executions = [:]
 	Map<String, Map<String, String>> state = [:]
 	environments.each { BuildEnvironment buildEnv ->
-		// Don't build environments for newer JDKs when this is a PR
-		if ( helper.scmSource.pullRequest && buildEnv.testJdkVersion ) {
+		// Don't build environments for newer JDKs when this is a PR, unless the PR is labelled with 'jdk' or 'jdk-<version>'
+		if ( helper.scmSource.pullRequest &&
+				buildEnv.testJdkVersion && buildEnv.testJdkVersion.toInteger() > DEFAULT_JDK_VERSION.toInteger() &&
+				!pullRequest.labels.contains( 'jdk' ) && !pullRequest.labels.contains( "jdk-${buildEnv.testJdkVersion}" ) ) {
 			return
 		}
 		state[buildEnv.tag] = [:]
 		executions.put(buildEnv.tag, {
 			runBuildOnNode(buildEnv.node ?: NODE_PATTERN_BASE) {
+				def mainJavaHome
+				if ( buildEnv.mainJdkVersion ) {
+					mainJavaHome = tool(name: "OpenJDK ${buildEnv.mainJdkVersion} Latest", type: 'jdk')
+				}
 				def testJavaHome
 				if ( buildEnv.testJdkVersion ) {
 					testJavaHome = tool(name: "OpenJDK ${buildEnv.testJdkVersion} Latest", type: 'jdk')
@@ -117,9 +125,17 @@ stage('Build') {
 				// See https://github.com/jenkinsci/pipeline-plugin/blob/master/TUTORIAL.md
 				withEnv(["JAVA_HOME=${javaHome}", "PATH+JAVA=${javaHome}/bin"]) {
 					state[buildEnv.tag]['additionalOptions'] = '-PmavenMirror=nexus-load-balancer-c4cf05fd92f43ef8.elb.us-east-1.amazonaws.com'
-					if ( testJavaHome ) {
+					if ( buildEnv.mainJdkVersion ) {
+						state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
+								" -Pmain.jdk.version=${buildEnv.mainJdkVersion}"
+					}
+					if ( buildEnv.testJdkVersion ) {
+						state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
+								" -Ptest.jdk.version=${buildEnv.testJdkVersion}"
+					}
+					if ( buildEnv.mainJdkVersion || buildEnv.testJdkVersion ) {
 						state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
-								" -Ptest.jdk.version=${buildEnv.testJdkVersion} -Porg.gradle.java.installations.paths=${javaHome},${testJavaHome}"
+								" -Porg.gradle.java.installations.paths=${[javaHome, mainJavaHome, testJavaHome].findAll { it != null }.join(',')}"
 					}
 					if ( buildEnv.testJdkLauncherArgs ) {
 						state[buildEnv.tag]['additionalOptions'] = state[buildEnv.tag]['additionalOptions'] +
@@ -205,6 +221,7 @@ stage('Build') {
 // Job-specific helpers
 
 class BuildEnvironment {
+	String mainJdkVersion
 	String testJdkVersion
 	String testJdkLauncherArgs
 	String dbName = 'h2'

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

@@ -576,6 +576,7 @@ The following special functions make it possible to discover or narrow expressio
 | `cast()` | Narrow a basic type | `cast(x as Type)` | ✔
 | `str()` | Cast to a string | `str(x)` | ✖
 | `ordinal()` | Get the ordinal value of an enum | `ordinal(x)` | ✖
+| `string()` | Get the string-valued name of an enum | `string(x)` | ✖
 |===
 
 Let's see what these functions do.
@@ -647,16 +648,17 @@ select str(id) from Order
 
 [[function-ordinal]]
 [discrete]
-===== Extracting the ordinal value of an enum
+===== Extracting the ordinal value or name of an enum
 
-The function `ordinal(x)` extracts the ordinal value of an enum.
-It supports both enum fields mapped as `ORDINAL` and `STRING`.
+The function `ordinal(x)` extracts the ordinal value of an enum, and the function `string(x)` extracts the name of the enum value as a string.
 
 [source, hql]
 ----
-select ordinal(p.type) from Phone p
+select ordinal(p.type), string(p.type) from Phone p
 ----
 
+Both functions work with enum fields mapped as `ORDINAL` and with enum fields mapped as `STRING`.
+
 [[functions-null]]
 ==== Functions for working with null values
 

gradle.properties

@@ -28,4 +28,5 @@ org.gradle.java.installations.auto-download=false
 # externalized definition of JDK versions so that they are available in both Project (build.gradle) and Settings (settings.gradle)
 orm.jdk.base=17
 orm.jdk.min=21
-orm.jdk.max=24
+# See gradlew/wrapper/gradle-wrapper.properties, https://docs.gradle.org/current/userguide/compatibility.html#java_runtime
+orm.jdk.max=22