Merge remote-tracking branch 'upstream/main' into wip/6.0

Author: dreab8

CONTRIBUTING.md

@@ -21,10 +21,10 @@ While we try to keep requirements for contributing to a minimum, there are a few
 we ask that you mind.
 
 For code contributions, these guidelines include:
-* respect the project code style - find templates for [IntelliJ IDEA](https://community.jboss.org/docs/DOC-15468) or [Eclipse](https://community.jboss.org/docs/DOC-16649)
+* respect the project code style - find templates for [IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/) or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)
 * have a corresponding JIRA issue and the key for this JIRA issue should be used in the commit message
 * have a set of appropriate tests.  For bug reports, the tests reproduce the initial reported bug
-	and illustrates that the solution actually fixes the bug.  For features/enhancements, the 
+	and illustrate that the solution actually fixes the bug.  For features/enhancements, the 
 	tests illustrate the feature working as intended.  In both cases the tests are incorporated into
 	the project to protect against regressions
 * if applicable, documentation is updated to reflect the introduced changes
@@ -47,14 +47,14 @@ GitHub there are a few pre-requisite steps to follow:
 the linked page, this also includes:
     * [set up your local git install](https://help.github.com/articles/set-up-git) 
     * clone your fork
-* See the wiki pages for setting up your IDE, whether you use 
-[IntelliJ IDEA](https://community.jboss.org/wiki/ContributingToHibernateUsingIntelliJ)
-or [Eclipse](https://community.jboss.org/wiki/ContributingToHibernateUsingEclipse)<sup>(1)</sup>.
+* see the wiki pages for setting up your IDE, whether you use 
+[IntelliJ IDEA](https://hibernate.org/community/contribute/intellij-idea/)
+or [Eclipse](https://hibernate.org/community/contribute/eclipse-ide/)<sup>(1)</sup>.
 
 
 ## Create the working (topic) branch
 
-Create a [topic branch](http://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches) 
+Create a [topic branch](https://git-scm.com/book/en/Git-Branching-Branching-Workflows#Topic-Branches) 
 on which you will work.  The convention is to incorporate the JIRA issue key in the name of this branch,
 although this is more of a mnemonic strategy than a hard-and-fast rule - but doing so helps:
 * remember what each branch is for 
@@ -87,7 +87,7 @@ appreciated btw), please use rebasing rather than merging.  Merging creates
 ## Submit
 
 * push your changes to the topic branch in your fork of the repository
-* initiate a [pull request](http://help.github.com/articles/creating-a-pull-request)
+* initiate a [pull request](https://help.github.com/articles/creating-a-pull-request)
 * update the JIRA issue by providing the PR link in the **Pull Request** column on the right
 
 

README.adoc

@@ -3,17 +3,17 @@ to applications, libraries, and frameworks.
 
 It also provides an implementation of the JPA specification, which is the standard Java specification for ORM.
 
-This is the repository of its source code; see http://hibernate.org/orm/[Hibernate.org] for additional information.
+This is the repository of its source code; see https://hibernate.org/orm/[Hibernate.org] for additional information.
 
-image:http://ci.hibernate.org/job/hibernate-orm-main-h2-main/badge/icon[Build Status,link=http://ci.hibernate.org/job/hibernate-orm-main-h2-main/]
+image:https://ci.hibernate.org/job/hibernate-orm-main-h2-main/badge/icon[Build Status,link=https://ci.hibernate.org/job/hibernate-orm-main-h2-main/]
 image:https://img.shields.io/lgtm/grade/java/g/hibernate/hibernate-orm.svg?logo=lgtm&logoWidth=18[Language grade: Java,link=https://lgtm.com/projects/g/hibernate/hibernate-orm/context:java]
 
 == Continuous Integration
 
-Hibernate uses both http://jenkins-ci.org[Jenkins] and https://github.com/features/actions[GitHub Actions]
+Hibernate uses both https://jenkins-ci.org[Jenkins] and https://github.com/features/actions[GitHub Actions]
 for its CI needs. See
 
-* http://ci.hibernate.org/view/ORM/[Jenkins Jobs]
+* https://ci.hibernate.org/view/ORM/[Jenkins Jobs]
 * https://github.com/hibernate/hibernate-orm/actions[GitHub Actions Jobs]
 
 == Building from sources
@@ -25,7 +25,7 @@ Gradle.
 
 Contributors should read the link:CONTRIBUTING.md[Contributing Guide].
 
-See the guides for setting up http://hibernate.org/community/contribute/intellij-idea/[IntelliJ] or
+See the guides for setting up https://hibernate.org/community/contribute/intellij-idea/[IntelliJ] or
 https://hibernate.org/community/contribute/eclipse-ide/[Eclipse] as your development environment.
 
 == Gradle Primer

ci/jpa-2.2-tck.Jenkinsfile

@@ -7,6 +7,9 @@ pipeline {
     tools {
         jdk 'OpenJDK 8 Latest'
     }
+    parameters {
+        booleanParam(name: 'NO_SLEEP', defaultValue: true, description: 'Whether the NO_SLEEP patch should be applied to speed up the TCK execution')
+	}
     stages {
         stage('Build') {
         	steps {
@@ -39,18 +42,21 @@ pipeline {
 			steps {
 				sh """ \
 					docker rm -f tck || true
-					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -e NO_SLEEP=true -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
-					docker cp tck:/tck/persistence-tck/tmp/JTreport/ ./JTreport
+                    docker rm -f tck-vol || true
+                    docker volume create tck-vol
+					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -v tck-vol:/tck/persistence-tck/tmp/:z -e NO_SLEEP=${params.NO_SLEEP} -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
+					docker cp tck:/tck/persistence-tck/tmp/ ./results
 				"""
-				archiveArtifacts artifacts: 'JTreport/**'
+				archiveArtifacts artifacts: 'results/**'
 				script {
 					failures = sh (
 						script: """ \
+						    set +x
 							while read line; do
 							  if [[ "\$line" != *"Passed." ]]; then
 								echo "\$line"
 							  fi
-							done <JTreport/text/summary.txt
+							done <results/JTreport/text/summary.txt
 						""",
 						returnStdout: true
 					).trim()

ci/jpa-3.0-tck.Jenkinsfile

@@ -7,6 +7,12 @@ pipeline {
     tools {
         jdk 'OpenJDK 8 Latest'
     }
+    parameters {
+        choice(name: 'IMAGE_JDK', choices: ['jdk8', 'jdk11'], description: 'The JDK base image version to use for the TCK image.')
+        string(name: 'TCK_VERSION', defaultValue: '3.0.0', description: 'The version of the Jakarta JPA TCK i.e. `2.2.0` or `3.0.1`')
+        string(name: 'TCK_SHA', defaultValue: 'b08c8887f00306f8bb7ebe54c4c810f3452519f5395733637ccc639b5081aebf', description: 'The SHA256 of the Jakarta JPA TCK that is distributed under https://download.eclipse.org/jakartaee/persistence/3.0/jakarta-persistence-tck-${TCK_VERSION}.zip.sha256')
+        booleanParam(name: 'NO_SLEEP', defaultValue: true, description: 'Whether the NO_SLEEP patch should be applied to speed up the TCK execution')
+	}
     stages {
         stage('Build') {
         	steps {
@@ -30,7 +36,7 @@ pipeline {
 				dir('tck') {
 					checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: '*/main']], extensions: [], userRemoteConfigs: [[url: 'https://github.com/hibernate/jakarta-tck-runner.git']]]
 					sh """ \
-						cd jpa-3.0; docker build -t jakarta-tck-runner .
+						cd jpa-3.0; docker build -f Dockerfile.${params.IMAGE_JDK} -t jakarta-tck-runner --build-arg TCK_VERSION=${params.TCK_VERSION} --build-arg TCK_SHA=${params.TCK_SHA} .
 					"""
 				}
 			}
@@ -39,18 +45,21 @@ pipeline {
 			steps {
 				sh """ \
 					docker rm -f tck || true
-					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -e NO_SLEEP=true -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
-					docker cp tck:/tck/persistence-tck/tmp/JTreport/ ./JTreport
+                    docker rm -f tck-vol || true
+                    docker volume create tck-vol
+					docker run -v ~/.m2/repository/org/hibernate:/root/.m2/repository/org/hibernate:z -v tck-vol:/tck/persistence-tck/tmp/:z -e NO_SLEEP=${params.NO_SLEEP} -e HIBERNATE_VERSION=$HIBERNATE_VERSION --name tck jakarta-tck-runner
+					docker cp tck:/tck/persistence-tck/tmp/ ./results
 				"""
-				archiveArtifacts artifacts: 'JTreport/**'
+				archiveArtifacts artifacts: 'results/**'
 				script {
 					failures = sh (
 						script: """ \
+						    set +x
 							while read line; do
 							  if [[ "\$line" != *"Passed." ]]; then
 								echo "\$line"
 							  fi
-							done <JTreport/text/summary.txt
+							done <results/JTreport/text/summary.txt
 						""",
 						returnStdout: true
 					).trim()

documentation/documentation.gradle

@@ -122,14 +122,14 @@ task aggregateJavadocs(type: Javadoc) {
 		overview = project.file( 'src/main/javadoc/overview.html' )
 		windowTitle = 'Hibernate JavaDocs'
 		docTitle = "Hibernate JavaDoc ($project.version)"
-		bottom = "Copyright &copy; 2001-$currentYear <a href=\"http://redhat.com\">Red Hat, Inc.</a>  All Rights Reserved."
+		bottom = "Copyright &copy; 2001-$currentYear <a href=\"https://redhat.com\">Red Hat, Inc.</a>  All Rights Reserved."
 		use = true
 		options.encoding = 'UTF-8'
 
 		links = [
 				'https://docs.oracle.com/javase/8/docs/api/',
-				'http://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/',
-				'http://docs.jboss.org/cdi/api/2.0/',
+				'https://docs.jboss.org/hibernate/beanvalidation/spec/2.0/api/',
+				'https://docs.jboss.org/cdi/api/2.0/',
 				'https://javaee.github.io/javaee-spec/javadocs/'
 		]
 

documentation/src/main/asciidoc/integrationguide/Preface.adoc

@@ -1,7 +1,7 @@
 [[preface]]
 == Preface
 
-Hibernate is an http://en.wikipedia.org/wiki/Object-relational_mapping[Object/Relational Mapping] solution for Java environments.
+Hibernate is an https://en.wikipedia.org/wiki/Object-relational_mapping[Object/Relational Mapping] solution for Java environments.
 
 Hibernate not only takes care of the mapping from Java classes to database tables (and from Java data types to SQL data types), but also provides data query and retrieval facilities.
 It can significantly reduce development time otherwise spent with manual data handling in SQL and JDBC.

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

@@ -9,14 +9,14 @@ hibernate-core:: The main (core) Hibernate module.  Defines its ORM features and
 hibernate-envers:: Hibernate's historical entity versioning feature
 hibernate-spatial:: Hibernate's Spatial/GIS data-type support
 hibernate-osgi:: Hibernate support for running in OSGi containers.
-hibernate-agroal:: Integrates the http://agroal.github.io/[Agroal] connection pooling library into Hibernate
-hibernate-c3p0:: Integrates the http://www.mchange.com/projects/c3p0/[C3P0] connection pooling library into Hibernate
+hibernate-agroal:: Integrates the https://agroal.github.io/[Agroal] connection pooling library into Hibernate
+hibernate-c3p0:: Integrates the https://www.mchange.com/projects/c3p0/[C3P0] connection pooling library into Hibernate
 hibernate-hikaricp:: Integrates the https://github.com/brettwooldridge/HikariCP/[HikariCP] connection pooling library into Hibernate
-hibernate-vibur:: Integrates the http://www.vibur.org/[Vibur DBCP] connection pooling library into Hibernate
-hibernate-proxool:: Integrates the http://proxool.sourceforge.net/[Proxool] connection pooling library into Hibernate
+hibernate-vibur:: Integrates the https://www.vibur.org/[Vibur DBCP] connection pooling library into Hibernate
+hibernate-proxool:: Integrates the https://proxool.sourceforge.net/[Proxool] connection pooling library into Hibernate
 hibernate-jcache:: Integrates the https://jcp.org/en/jsr/detail?id=107$$[JCache] caching specification into Hibernate,
 enabling any compliant implementation to become a second-level cache provider.
-hibernate-ehcache:: Integrates the http://ehcache.org/[Ehcache] caching library into Hibernate as a second-level cache provider.
+hibernate-ehcache:: Integrates the https://ehcache.org/[Ehcache] caching library into Hibernate as a second-level cache provider.
 
 === Release Bundle Downloads
 
@@ -43,10 +43,10 @@ synced to Maven Central as part of an automated job (some small delay may occur)
 
 The team responsible for the JBoss Maven repository maintains a number of Wiki pages that contain important information:
 
-* http://community.jboss.org/docs/DOC-14900 - General information about the repository.
-* http://community.jboss.org/docs/DOC-15170 - Information about setting up the JBoss repositories in order to do
+* https://community.jboss.org/docs/DOC-14900 - General information about the repository.
+* https://community.jboss.org/docs/DOC-15170 - Information about setting up the JBoss repositories in order to do
 development work on JBoss projects themselves.
-* http://community.jboss.org/docs/DOC-15169 - Information about setting up access to the repository to use JBoss
+* https://community.jboss.org/docs/DOC-15169 - Information about setting up access to the repository to use JBoss
 projects as part of your own software.
 
 The Hibernate ORM artifacts are published under the `org.hibernate` groupId.

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

@@ -7,14 +7,14 @@ Working with both Object-Oriented software and Relational Databases can be cumbe
 Development costs are significantly higher due to a number of "paradigm mismatches" between how data is represented in objects
 versus relational databases.  Hibernate is an Object/Relational Mapping (ORM) solution for Java environments.  The
 term Object/Relational Mapping refers to the technique of mapping data between an object model representation to
-a relational data model representation.  See http://en.wikipedia.org/wiki/Object-relational_mapping for a good
-high-level discussion.  Also, Martin Fowler's link:$$http://martinfowler.com/bliki/OrmHate.html$$[OrmHate] article
+a relational data model representation.  See https://en.wikipedia.org/wiki/Object-relational_mapping for a good
+high-level discussion.  Also, Martin Fowler's link:$$https://martinfowler.com/bliki/OrmHate.html$$[OrmHate] article
 takes a look at many of the mismatch problems.
 
 Although having a strong background in SQL is not required to use Hibernate, having a basic understanding of the
 concepts can help you understand Hibernate more quickly and fully.  An understanding of data modeling principles
-is especially important.  Both http://www.agiledata.org/essays/dataModeling101.html and
-http://en.wikipedia.org/wiki/Data_modeling are good starting points for understanding these data modeling
+is especially important.  Both https://www.agiledata.org/essays/dataModeling101.html and
+https://en.wikipedia.org/wiki/Data_modeling are good starting points for understanding these data modeling
 principles.  If you are completely new to database access in Java,
 https://www.marcobehler.com/guides/a-guide-to-accessing-databases-in-java contains a good overview of the various parts,
 pieces and options.
@@ -33,6 +33,6 @@ logic in the Java-based middle-tier. However, Hibernate can certainly help you t
 vendor-specific SQL code and streamlines the common task of translating result sets from a tabular
 representation to a graph of objects.
 
-See http://hibernate.org/orm/contribute/ for information on getting involved.
+See https://hibernate.org/orm/contribute/ for information on getting involved.
 
 IMPORTANT: The projects and code for the tutorials referenced in this guide are available as link:hibernate-tutorials.zip[]

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

@@ -98,7 +98,7 @@ any mapping information associated with `title`.
 
 .Practice Exercises
 - [ ] Add an association to the `Event` entity to model a message thread. Use the
-http://docs.jboss.org/hibernate/orm/current/userguide/html_single/Hibernate_User_Guide.html[_User Guide_] for more details.
+https://docs.jboss.org/hibernate/orm/current/userguide/html_single/Hibernate_User_Guide.html[_User Guide_] for more details.
 - [ ] Add a callback to receive notifications when an `Event` is created, updated or deleted.
 Try the same with an event listener. Use the
-http://docs.jboss.org/hibernate/orm/current/userguide/html_single/Hibernate_User_Guide.html[_User Guide_] for more details.
+https://docs.jboss.org/hibernate/orm/current/userguide/html_single/Hibernate_User_Guide.html[_User Guide_] for more details.

documentation/src/main/asciidoc/topical/metamodelgen/MetamodelGenerator.adoc

@@ -12,7 +12,7 @@ static metamodel classes.
 For developers it is important that the task of the metamodel generation 
 can be automated.
 Hibernate Static Metamodel Generator is an annotation processor based on 
-http://jcp.org/en/jsr/detail?id=269[JSR_269] with the task of creating JPA 2
+https://jcp.org/en/jsr/detail?id=269[JSR_269] with the task of creating JPA 2
 static metamodel classes.
 The following example shows two JPA 2 entities `Order` and `Item`, together
 with the metamodel class `Order_` and a typesafe query.
@@ -111,7 +111,7 @@ persistence unit metadata:
 == Canonical Metamodel
 
 The structure of the metamodel classes is described in the JPA 2 
-(JSR 317) http://jcp.org/en/jsr/detail?id=317[specification], but for
+(JSR 317) https://jcp.org/en/jsr/detail?id=317[specification], but for
 completeness the definition is repeated in the following paragraphs.
 Feel free to skip ahead to the <<chapter-usage,usage chapter>>, if you
 are not interested into the gory details.
@@ -258,9 +258,9 @@ pass the processor option to the compiler plugin:
 ====
 The maven-compiler-plugin approach has the disadvantage that the maven compiler plugin 
 does currently not allow to specify multiple compiler arguments 
-(http://jira.codehaus.org/browse/MCOMPILER-62[MCOMPILER-62]) 
+(https://jira.codehaus.org/browse/MCOMPILER-62[MCOMPILER-62])
 and that messages from the Messenger API are suppressed 
-(http://jira.codehaus.org/browse/MCOMPILER-66[MCOMPILER-66]).
+(https://jira.codehaus.org/browse/MCOMPILER-66[MCOMPILER-66]).
 A better approach is to disable annotation processing for the compiler
 plugin as seen in below.
 

documentation/src/main/asciidoc/topical/registries/ServiceRegistries.adoc

@@ -343,7 +343,7 @@ service to be injected is optional, use `InjectService#required=false`.
 Once built, a ServiceRegistry is generally considered immutable.  The Services themselves might accept
 re-configuration, but immutability here means adding/replacing services.  So all the services hosted in a particular
 ServiceRegistry must be known up-front.  To this end, building a ServiceRegistry usually employees a
-http://en.wikipedia.org/wiki/Builder_pattern[builder^].
+https://en.wikipedia.org/wiki/Builder_pattern[builder^].
 
 === Building BootstrapServiceRegistry
 

documentation/src/main/asciidoc/topical/wildfly/Wildfly.adoc

@@ -2,7 +2,7 @@
 
 == Hibernate ORM within WildFly
 
-The http://wildfly.org/[WildFly application server] includes Hibernate ORM as the default JPA provider out of the box.
+The https://wildfly.org/[WildFly application server] includes Hibernate ORM as the default JPA provider out of the box.
 
 In previous versions of Hibernate ORM, we offered a "feature pack" to enable anyone to use the very latest version in
 WildFly as soon as a new release of Hibernate ORM was published.